Merge branch 'v2-prototype' into feature/combinatorial-testing

* v2-prototype:
  Prettier fix
  Update default params in sendRawPaylodAsync for improved JSON-RPC compatibility
  Fix missed merge conflicts
  Fix additional versions and update yarn.lock
  Add OrderWatcherConfig type to 0x.js docs page
  Export OrderWatcherConfig from 0x.js
  Update all package versions to match latest published to NPM
  Update CHANGELOG's with publishes performed on development branch
  Rebase with latest removing PROXY_ID from transfer
  Split transfer impl and AssetProxyMixin
  change @0xproject/types to ethereum-types
  remove mistaken comment
  workaround for TypeScript trailing comma bug
  Document contract_templates

3 files changed, 70 insertions, 18 deletions

diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json
index dde78445a..4afd4b9b5 100644
--- a/packages/order-watcher/CHANGELOG.json
+++ b/packages/order-watcher/CHANGELOG.json
@@ -1,5 +1,41 @@
 [
     {
+        "timestamp": 1529397769,
+        "version": "0.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527617805,
+        "version": "0.0.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527617227,
+        "version": "0.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1527616612,
+        "version": "0.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1527008794,
         "version": "0.0.2",
         "changes": [
diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md
index 999d62f44..5e216f90c 100644
--- a/packages/order-watcher/CHANGELOG.md
+++ b/packages/order-watcher/CHANGELOG.md
@@ -5,6 +5,22 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.0.6 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.0.5 - _May 29, 2018_
+
+    * Dependencies updated
+
+## v0.0.4 - _May 29, 2018_
+
+    * Dependencies updated
+
+## v0.0.3 - _May 29, 2018_
+
+    * Dependencies updated
+
 ## v0.0.2 - _May 22, 2018_
 
     * Dependencies updated
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 2e5dfb094..c407d25bd 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/order-watcher",
-    "version": "0.0.2",
+    "version": "0.0.6",
     "description": "An order watcher daemon that watches for order validity",
     "keywords": [
         "0x",
@@ -47,12 +47,12 @@
         "node": ">=6.0.0"
     },
     "devDependencies": {
-        "@0xproject/abi-gen": "^0.3.0",
-        "@0xproject/dev-utils": "^0.4.2",
-        "@0xproject/migrations": "^0.0.6",
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/sol-compiler": "^0.5.0",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/abi-gen": "^0.3.2",
+        "@0xproject/dev-utils": "^0.4.4",
+        "@0xproject/migrations": "^0.0.8",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/sol-compiler": "^0.5.2",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/bintrees": "^1.0.2",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
@@ -77,19 +77,19 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/assert": "^0.2.10",
-        "@0xproject/base-contract": "^0.3.2",
-        "@0xproject/contract-wrappers": "^0.0.2",
-        "@0xproject/fill-scenarios": "^0.0.2",
-        "@0xproject/json-schemas": "0.7.22",
-        "@0xproject/order-utils": "0.0.5",
-        "@0xproject/types": "0.7.0",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
+        "@0xproject/assert": "^0.2.12",
+        "@0xproject/base-contract": "^0.3.4",
+        "@0xproject/contract-wrappers": "^0.0.5",
+        "@0xproject/fill-scenarios": "^0.0.4",
+        "@0xproject/json-schemas": "0.8.1",
+        "@0xproject/order-utils": "^0.0.7",
+        "@0xproject/types": "^0.8.1",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
         "ethereum-types": "^0.0.1",
         "bintrees": "^1.0.2",
-        "ethers": "^3.0.15",
+        "ethers": "3.0.22",
         "lodash": "^4.17.4"
     },
     "publishConfig": {