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, 27 insertions, 18 deletions

diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json
index f3c54711f..6290eee0f 100644
--- a/packages/order-utils/CHANGELOG.json
+++ b/packages/order-utils/CHANGELOG.json
@@ -1,18 +1,19 @@
 [
     {
+        "timestamp": 1529397769,
+        "version": "0.0.7",
         "changes": [
             {
-                "note": "Export parseECSignature method",
-                "pr": 684
+                "note": "Dependencies updated"
             }
         ]
     },
     {
-        "version": "0.1.0",
+        "timestamp": 1527616612,
+        "version": "0.0.6",
         "changes": [
             {
-                "note": "Make order-utils compatible with V2 of 0x protocol",
-                "pr": 636
+                "note": "Dependencies updated"
             }
         ]
     },
diff --git a/packages/order-utils/CHANGELOG.md b/packages/order-utils/CHANGELOG.md
index 5b10c13bc..81b66373a 100644
--- a/packages/order-utils/CHANGELOG.md
+++ b/packages/order-utils/CHANGELOG.md
@@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.0.7 - _June 19, 2018_
+
+    * Dependencies updated
+
+## v0.0.6 - _May 29, 2018_
+
+    * Dependencies updated
+
 ## v0.0.5 - _May 22, 2018_
 
     * Add orderStateUtils, a module for computing order state needed to decide if an order is still valid
 
-## v0.0.4 - _May 4, 2018_
+## v0.0.4 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index 8f37bb138..bd18b7855 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/order-utils",
-    "version": "0.0.6",
+    "version": "1.0.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -51,10 +51,10 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",
     "devDependencies": {
-        "@0xproject/dev-utils": "^0.4.2",
-        "@0xproject/migrations": "^0.0.6",
-        "@0xproject/monorepo-scripts": "^0.1.20",
-        "@0xproject/tslint-config": "^0.4.18",
+        "@0xproject/dev-utils": "^0.4.4",
+        "@0xproject/migrations": "^0.0.8",
+        "@0xproject/monorepo-scripts": "^0.2.1",
+        "@0xproject/tslint-config": "^0.4.20",
         "@types/ethereumjs-abi": "^0.6.0",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
@@ -73,20 +73,20 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/assert": "^0.2.10",
-        "@0xproject/base-contract": "^0.3.2",
+        "@0xproject/assert": "^0.2.12",
+        "@0xproject/base-contract": "^0.3.4",
         "@0xproject/json-schemas": "1.0.0",
-        "@0xproject/sol-compiler": "^0.5.0",
+        "@0xproject/sol-compiler": "^0.5.2",
         "@0xproject/types": "^1.0.0",
-        "@0xproject/typescript-typings": "^0.3.2",
-        "@0xproject/utils": "^0.6.2",
-        "@0xproject/web3-wrapper": "^0.6.4",
+        "@0xproject/typescript-typings": "^0.4.1",
+        "@0xproject/utils": "^0.7.1",
+        "@0xproject/web3-wrapper": "^0.7.1",
         "@types/node": "^8.0.53",
         "bn.js": "^4.11.8",
         "ethereum-types": "^0.0.1",
         "ethereumjs-abi": "^0.6.4",
         "ethereumjs-util": "^5.1.1",
-        "ethers": "^3.0.15",
+        "ethers": "3.0.22",
         "lodash": "^4.17.4"
     },
     "publishConfig": {