Merge branch 'development' into feature/portal-ledger-support

* development: (437 commits)
  Publish
  Update yarn.lock
  Update the CHANGELOG
  Fix the bug making it impossible to specify the custom ZRX address
  Fix fill/cancel order by looking for NoError instead of empty blockchainErr given the BlockchainErrs type refactor
  Add a comment about a yarn bug
  Add our mainnet and kovan nodes as backups for Portal requests
  Fix bug hiding the user info from topBar
  Add dev-utils package to top level README
  Prettier newline
  Prettier
  Allow Token symbols to be alphanumeric
  Update CHANGELOG, rebase on development
  Should not -> cannot
  Reject negative amounts in isValidBaseUnitAmount
  Re-add changelog for 0x.js
  Fix prettier
  Update yarn.lock
  Move tests to a separate folder
  Change file layout
  ...

# Conflicts:
#	packages/website/README.md

1 files changed, 34 insertions, 35 deletions

diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index 4eea7ed31..a0e15b48d 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -1,37 +1,36 @@
 {
-  "name": "@0xproject/web3-wrapper",
-  "version": "0.0.1",
-  "description": "Wraps around web3 and gives a nicer interface",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "scripts": {
-    "build": "tsc",
-    "clean": "shx rm -rf lib",
-    "lint": "tslint --project . 'src/**/*.ts'"
-  },
-  "license": "Apache-2.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/0xProject/0x.js.git"
-  },
-  "bugs": {
-    "url": "https://github.com/0xProject/0x.js/issues"
-  },
-  "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md",
-  "devDependencies": {
-    "@0xproject/tslint-config": "^0.2.0",
-    "@0xproject/types": "^0.0.1",
-    "@types/lodash": "^4.14.86",
-    "npm-run-all": "^4.1.2",
-    "shx": "^0.2.2",
-    "tslint": "5.8.0",
-    "typescript": "~2.6.1",
-    "web3-typescript-typings": "^0.7.2"
-  },
-  "dependencies": {
-    "@0xproject/utils": "^0.0.1",
-    "bignumber.js": "~4.1.0",
-    "lodash": "^4.17.4",
-    "web3": "^0.20.0"
-  }
+    "name": "@0xproject/web3-wrapper",
+    "version": "0.1.6",
+    "description": "Wraps around web3 and gives a nicer interface",
+    "main": "lib/index.js",
+    "types": "lib/index.d.ts",
+    "scripts": {
+        "build": "tsc",
+        "clean": "shx rm -rf lib",
+        "lint": "tslint --project . 'src/**/*.ts'"
+    },
+    "license": "Apache-2.0",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/0xProject/0x.js.git"
+    },
+    "bugs": {
+        "url": "https://github.com/0xProject/0x.js/issues"
+    },
+    "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md",
+    "devDependencies": {
+        "@0xproject/tslint-config": "^0.4.3",
+        "@0xproject/types": "^0.1.5",
+        "@types/lodash": "^4.14.86",
+        "npm-run-all": "^4.1.2",
+        "shx": "^0.2.2",
+        "tslint": "5.8.0",
+        "typescript": "~2.6.1",
+        "web3-typescript-typings": "^0.9.5"
+    },
+    "dependencies": {
+        "@0xproject/utils": "^0.2.1",
+        "lodash": "^4.17.4",
+        "web3": "^0.20.0"
+    }
 }