Merge branch 'development' into features/orderwatcher_ws

* development: (107 commits)
  Fix OrderWatcher title to fix sidebar top
  Fix version picker so it doesn't overflow onto two lines
  Fix bug in pull_missing_blocks with incorrect start block (#1438)
  Pull approval events for ZRX and DAI (#1430)
  fix semicolon and apply prettier
  Fix dex order quote/base asset assigning (#1432)
  Apply prettier
  Publish
  Updated CHANGELOGS
  Rename contracts CHANGELOGs to DEPLOYs
  Move Forwarder CHANGELOG entries to extensions CHANGELOG
  Make contracts packages not private
  Publish
  Updated CHANGELOGS
  Show @ price in light grey
  Updated CHANGELOGS
  typeof -> isString
  add special case to scrape OHLCV for eth/usd (#1428)
  run linter
  simplify scaling input logic
  ...

3 files changed, 32 insertions, 14 deletions

diff --git a/packages/asset-buyer/CHANGELOG.json b/packages/asset-buyer/CHANGELOG.json
index 4ff83018e..470d9b03b 100644
--- a/packages/asset-buyer/CHANGELOG.json
+++ b/packages/asset-buyer/CHANGELOG.json
@@ -1,11 +1,21 @@
 [
     {
+        "version": "3.0.4",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1544739608
+    },
+    {
         "version": "3.0.3",
         "changes": [
             {
                 "note": "Update SRA order provider to include Dai"
             }
-        ]
+        ],
+        "timestamp": 1544570656
     },
     {
         "timestamp": 1543401373,
diff --git a/packages/asset-buyer/CHANGELOG.md b/packages/asset-buyer/CHANGELOG.md
index be3ef67d1..cadb1acf8 100644
--- a/packages/asset-buyer/CHANGELOG.md
+++ b/packages/asset-buyer/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v3.0.4 - _December 13, 2018_
+
+    * Dependencies updated
+
+## v3.0.3 - _December 11, 2018_
+
+    * Update SRA order provider to include Dai
+
 ## v3.0.2 - _November 28, 2018_
 
     * Dependencies updated
diff --git a/packages/asset-buyer/package.json b/packages/asset-buyer/package.json
index 780b2e3e2..401aec120 100644
--- a/packages/asset-buyer/package.json
+++ b/packages/asset-buyer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/asset-buyer",
-    "version": "3.0.2",
+    "version": "3.0.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -36,21 +36,21 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/asset-buyer/README.md",
     "dependencies": {
-        "@0x/assert": "^1.0.18",
-        "@0x/connect": "^3.0.8",
-        "@0x/contract-wrappers": "^4.1.1",
-        "@0x/json-schemas": "^2.1.2",
-        "@0x/order-utils": "^3.0.4",
-        "@0x/subproviders": "^2.1.6",
-        "@0x/types": "^1.3.0",
-        "@0x/typescript-typings": "^3.0.4",
-        "@0x/utils": "^2.0.6",
-        "@0x/web3-wrapper": "^3.1.6",
-        "ethereum-types": "^1.1.2",
+        "@0x/assert": "^1.0.20",
+        "@0x/connect": "^3.0.10",
+        "@0x/contract-wrappers": "^4.1.3",
+        "@0x/json-schemas": "^2.1.4",
+        "@0x/order-utils": "^3.0.7",
+        "@0x/subproviders": "^2.1.8",
+        "@0x/types": "^1.4.1",
+        "@0x/typescript-typings": "^3.0.6",
+        "@0x/utils": "^2.0.8",
+        "@0x/web3-wrapper": "^3.2.1",
+        "ethereum-types": "^1.1.4",
         "lodash": "^4.17.5"
     },
     "devDependencies": {
-        "@0x/tslint-config": "^1.0.10",
+        "@0x/tslint-config": "^2.0.0",
         "@types/lodash": "^4.14.116",
         "@types/mocha": "^2.2.42",
         "@types/node": "*",