Merge branch 'master' into eyeballs

CHANGELOG.md

@@ -6,6 +6,11 @@
 - Replaced identicons with jazzicons
 - Fixed glitchy transitions
 
+## 1.8.3 2016-05-12
+
+- Bumped web3 to 0.6.0
+- Really fixed `eth_syncing` method response.
+
 ## 1.8.2 2016-05-11
 
 - Fixed bug where send view would not load correctly the first time it was visited per account.

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "Metamask",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "manifest_version": 2,
   "description": "__MSG_appDescription__",
   "icons": {

package.json

@@ -55,7 +55,7 @@
     "textarea-caret": "^3.0.1",
     "three.js": "^0.73.2",
     "through2": "^2.0.1",
-    "web3": "^0.15.1",
+    "web3": "ethereum/web3.js#0.16.0",
     "web3-provider-engine": "^7.6.3",
     "xtend": "^4.0.1"
   },