Merge branch 'development' into addExtraDocs

* development: (29 commits)
  Set Lodash dep to an exact version since newer versions introduced breaking changes
  Update Kovan Ethertoken Address
  Update deployer version since manual re-publish
  Add new entry into CHANGELOG
  Fix bad merge
  Update yarn.lock
  Change title
  Add Blake and Zach to About page
  Re-size Jacob and Tom's images
  Manually publish 0x.js back to a working state
  Publish
  Publish
  Fix 0x.js assets
  Remove assets from connect and _bundles from packages that don't generate the folder
  Publish
  Fix packages that aren't working as expected
  Make new packages default to public on publish
  Add new public packages to top-level README
  Update top-level package.json
  Fix incorrect new versions
  ...

# Conflicts:
#	packages/0x.js/package.json
#	packages/connect/package.json
#	packages/json-schemas/package.json
#	packages/sol-cov/package.json

1 files changed, 10 insertions, 10 deletions

diff --git a/packages/website/package.json b/packages/website/package.json
index a7fc1fe26..c455306ee 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/website",
-    "version": "0.0.18",
+    "version": "0.0.22",
     "private": true,
     "description": "Website and 0x portal dapp",
     "scripts": {
@@ -18,12 +18,12 @@
     "author": "Fabio Berger",
     "license": "Apache-2.0",
     "dependencies": {
-        "0x.js": "^0.33.1",
-        "@0xproject/react-docs": "^0.0.1",
-        "@0xproject/react-shared": "^0.0.1",
-        "@0xproject/subproviders": "^0.7.0",
-        "@0xproject/web3-wrapper": "^0.2.1",
-        "@0xproject/utils": "^0.4.1",
+        "0x.js": "^0.33.6",
+        "@0xproject/react-docs": "^0.0.4",
+        "@0xproject/react-shared": "^0.0.4",
+        "@0xproject/subproviders": "^0.8.2",
+        "@0xproject/utils": "^0.4.3",
+        "@0xproject/web3-wrapper": "^0.3.1",
         "accounting": "^0.4.1",
         "basscss": "^8.0.3",
         "blockies": "^0.0.2",
@@ -70,7 +70,7 @@
         "@types/dateformat": "^1.0.1",
         "@types/deep-equal": "^1.0.0",
         "@types/jsonschema": "^1.1.1",
-        "@types/lodash": "^4.14.86",
+        "@types/lodash": "4.14.104",
         "@types/material-ui": "0.18.0",
         "@types/moment": "^2.13.0",
         "@types/node": "^8.0.53",
@@ -87,7 +87,7 @@
         "copy-webpack-plugin": "^4.0.1",
         "copyfiles": "^1.2.0",
         "css-loader": "0.23.x",
-        "ethers-typescript-typings": "^0.0.2",
+        "ethers-typescript-typings": "^0.0.4",
         "exports-loader": "0.6.x",
         "imports-loader": "0.6.x",
         "json-loader": "^0.5.4",
@@ -99,7 +99,7 @@
         "tslint": "5.8.0",
         "tslint-config-0xproject": "^0.0.2",
         "typescript": "2.7.1",
-        "web3-typescript-typings": "^0.10.0",
+        "web3-typescript-typings": "^0.10.2",
         "webpack": "^3.1.0",
         "webpack-dev-middleware": "^1.10.0",
         "webpack-dev-server": "^2.5.0"