Merge remote-tracking branch 'upstream/development' into website

# Conflicts:
#	.gitignore
#	README.md
#	contracts/core/CHANGELOG.json
#	contracts/examples/package.json
#	contracts/extensions/package.json
#	contracts/interfaces/package.json
#	contracts/libs/package.json
#	contracts/multisig/package.json
#	contracts/protocol/CHANGELOG.json
#	contracts/protocol/DEPLOYS.json
#	contracts/protocol/package.json
#	contracts/test-utils/CHANGELOG.json
#	contracts/test-utils/CHANGELOG.md
#	contracts/test-utils/package.json
#	contracts/tokens/CHANGELOG.json
#	contracts/tokens/package.json
#	contracts/utils/package.json
#	packages/0x.js/CHANGELOG.json
#	packages/0x.js/CHANGELOG.md
#	packages/0x.js/package.json
#	packages/abi-gen-wrappers/CHANGELOG.json
#	packages/abi-gen-wrappers/CHANGELOG.md
#	packages/abi-gen-wrappers/package.json
#	packages/abi-gen/CHANGELOG.json
#	packages/abi-gen/CHANGELOG.md
#	packages/abi-gen/package.json
#	packages/assert/CHANGELOG.json
#	packages/assert/CHANGELOG.md
#	packages/assert/package.json
#	packages/asset-buyer/CHANGELOG.md
#	packages/asset-buyer/package.json
#	packages/base-contract/CHANGELOG.json
#	packages/base-contract/CHANGELOG.md
#	packages/base-contract/package.json
#	packages/connect/CHANGELOG.json
#	packages/connect/CHANGELOG.md
#	packages/connect/package.json
#	packages/contract-wrappers/CHANGELOG.json
#	packages/contract-wrappers/CHANGELOG.md
#	packages/contract-wrappers/package.json
#	packages/dev-tools-pages/package.json
#	packages/dev-utils/CHANGELOG.json
#	packages/dev-utils/CHANGELOG.md
#	packages/dev-utils/package.json
#	packages/ethereum-types/CHANGELOG.json
#	packages/ethereum-types/CHANGELOG.md
#	packages/ethereum-types/package.json
#	packages/fill-scenarios/CHANGELOG.json
#	packages/fill-scenarios/CHANGELOG.md
#	packages/fill-scenarios/package.json
#	packages/instant/package.json
#	packages/instant/src/types.ts
#	packages/json-schemas/CHANGELOG.json
#	packages/json-schemas/CHANGELOG.md
#	packages/json-schemas/package.json
#	packages/metacoin/package.json
#	packages/migrations/CHANGELOG.json
#	packages/migrations/CHANGELOG.md
#	packages/migrations/package.json
#	packages/order-utils/CHANGELOG.json
#	packages/order-utils/CHANGELOG.md
#	packages/order-utils/package.json
#	packages/order-watcher/CHANGELOG.json
#	packages/order-watcher/CHANGELOG.md
#	packages/order-watcher/package.json
#	packages/pipeline/package.json
#	packages/pipeline/src/ormconfig.ts
#	packages/pipeline/src/parsers/ddex_orders/index.ts
#	packages/pipeline/src/parsers/oasis_orders/index.ts
#	packages/pipeline/src/parsers/paradex_orders/index.ts
#	packages/pipeline/src/parsers/token_metadata/index.ts
#	packages/pipeline/src/scripts/pull_competing_dex_trades.ts
#	packages/pipeline/src/scripts/pull_ddex_orderbook_snapshots.ts
#	packages/pipeline/src/scripts/pull_idex_orderbook_snapshots.ts
#	packages/pipeline/src/scripts/pull_missing_blocks.ts
#	packages/pipeline/src/scripts/pull_oasis_orderbook_snapshots.ts
#	packages/pipeline/src/scripts/pull_paradex_orderbook_snapshots.ts
#	packages/pipeline/src/scripts/pull_trusted_tokens.ts
#	packages/pipeline/src/scripts/update_relayer_info.ts
#	packages/pipeline/src/utils/get_ohlcv_trading_pairs.ts
#	packages/pipeline/src/utils/index.ts
#	packages/pipeline/test/parsers/ddex_orders/index_test.ts
#	packages/pipeline/test/parsers/oasis_orders/index_test.ts
#	packages/pipeline/test/parsers/paradex_orders/index_test.ts
#	packages/react-docs/CHANGELOG.json
#	packages/react-docs/CHANGELOG.md
#	packages/react-docs/package.json
#	packages/react-shared/CHANGELOG.json
#	packages/react-shared/CHANGELOG.md
#	packages/react-shared/package.json
#	packages/sol-compiler/CHANGELOG.md
#	packages/sol-compiler/package.json
#	packages/sol-cov/CHANGELOG.json
#	packages/sol-cov/CHANGELOG.md
#	packages/sol-cov/package.json
#	packages/sol-doc/CHANGELOG.json
#	packages/sol-doc/CHANGELOG.md
#	packages/sol-doc/package.json
#	packages/sol-resolver/CHANGELOG.md
#	packages/sol-resolver/package.json
#	packages/sra-spec/CHANGELOG.json
#	packages/sra-spec/CHANGELOG.md
#	packages/sra-spec/package.json
#	packages/subproviders/CHANGELOG.json
#	packages/subproviders/CHANGELOG.md
#	packages/subproviders/package.json
#	packages/testnet-faucets/package.json
#	packages/types/CHANGELOG.md
#	packages/types/package.json
#	packages/typescript-typings/CHANGELOG.json
#	packages/typescript-typings/CHANGELOG.md
#	packages/typescript-typings/package.json
#	packages/utils/CHANGELOG.json
#	packages/utils/CHANGELOG.md
#	packages/utils/package.json
#	packages/web3-wrapper/CHANGELOG.json
#	packages/web3-wrapper/CHANGELOG.md
#	packages/web3-wrapper/package.json
#	packages/website/package.json
#	packages/website/public/index.html
#	packages/website/ts/pages/instant/fee_percentage_slider.tsx
#	yarn.lock

1 files changed, 3 insertions, 113 deletions

diff --git a/contracts/protocol/CHANGELOG.json b/contracts/protocol/CHANGELOG.json
index 371f18cd4..5c3798a69 100644
--- a/contracts/protocol/CHANGELOG.json
+++ b/contracts/protocol/CHANGELOG.json
@@ -1,120 +1,10 @@
 [
     {
-        "name": "MultiAssetProxy",
-        "version": "1.0.0",
+        "timestamp": 1544741676,
+        "version": "2.1.59",
         "changes": [
             {
-                "note": "Add MultiAssetProxy implementation",
-                "pr": 1224
-            }
-        ]
-    },
-    {
-        "name": "OrderValidator",
-        "version": "1.0.1",
-        "changes": [
-            {
-                "note": "remove `getApproved` check from ERC721 approval query",
-                "pr": 1149
-            }
-        ]
-    },
-    {
-        "name": "Forwarder",
-        "version": "1.1.0",
-        "changes": [
-            {
-                "note": "Round up when calculating remaining amounts in marketBuy functions",
-                "pr": 1162,
-                "networks": {
-                    "1": "0x5468a1dc173652ee28d249c271fa9933144746b1",
-                    "3": "0x2240dab907db71e64d3e0dba4800c83b5c502d4e",
-                    "42": "0x17992e4ffb22730138e4b62aaa6367fa9d3699a6"
-                }
-            }
-        ]
-    },
-    {
-        "name": "Forwarder",
-        "version": "1.0.0",
-        "changes": [
-            {
-                "note": "protocol v2 deploy",
-                "networks": {
-                    "1": "0x7afc2d5107af94c462a194d2c21b5bdd238709d6",
-                    "3": "0x3983e204b12b3c02fb0638caf2cd406a62e0ead3",
-                    "42": "0xd85e2fa7e7e252b27b01bf0d65c946959d2f45b8"
-                }
-            }
-        ]
-    },
-    {
-        "name": "OrderValidator",
-        "version": "1.0.0",
-        "changes": [
-            {
-                "note": "protocol v2 deploy",
-                "networks": {
-                    "1": "0x9463e518dea6810309563c81d5266c1b1d149138",
-                    "3": "0x90431a90516ab49af23a0530e04e8c7836e7122f",
-                    "42": "0xb389da3d204b412df2f75c6afb3d0a7ce0bc283d"
-                }
-            }
-        ]
-    },
-    {
-        "name": "Exchange",
-        "version": "2.0.0",
-        "changes": [
-            {
-                "note": "protocol v2 deploy",
-                "networks": {
-                    "1": "0x4f833a24e1f95d70f028921e27040ca56e09ab0b",
-                    "3": "0x4530c0483a1633c7a1c97d2c53721caff2caaaaf",
-                    "42": "0x35dd2932454449b14cee11a94d3674a936d5d7b2"
-                }
-            }
-        ]
-    },
-    {
-        "name": "ERC20Proxy",
-        "version": "1.0.0",
-        "changes": [
-            {
-                "note": "protocol v2 deploy",
-                "networks": {
-                    "1": "0x2240dab907db71e64d3e0dba4800c83b5c502d4e",
-                    "3": "0xb1408f4c245a23c31b98d2c626777d4c0d766caa",
-                    "42": "0xf1ec01d6236d3cd881a0bf0130ea25fe4234003e"
-                }
-            }
-        ]
-    },
-    {
-        "name": "ERC721Proxy",
-        "version": "1.0.0",
-        "changes": [
-            {
-                "note": "protocol v2 deploy",
-                "networks": {
-                    "1": "0x208e41fb445f1bb1b6780d58356e81405f3e6127",
-                    "3": "0xe654aac058bfbf9f83fcaee7793311dd82f6ddb4",
-                    "42": "0x2a9127c745688a165106c11cd4d647d2220af821"
-                }
-            }
-        ]
-    },
-    {
-        "name": "AssetProxyOwner",
-        "version": "1.0.0",
-        "changes": [
-            {
-                "note": "protocol v2 deploy",
-                "networks": {
-                    "1": "0x17992e4ffb22730138e4b62aaa6367fa9d3699a6",
-                    "3": "0xf5fa5b5fed2727a0e44ac67f6772e97977aa358b",
-                    "42": "0x2c824d2882baa668e0d5202b1e7f2922278703f8"
-                }
+                "note": "Dependencies updated"
             }
         ]
     }