Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vector-web",
-  "version": "0.6.1",
+  "version": "0.7.3",
   "description": "Vector webapp",
   "author": "matrix.org",
   "repository": {
@@ -33,6 +33,7 @@
   },
   "dependencies": {
     "babel-polyfill": "^6.5.0",
+    "browser-request": "^0.3.3",
     "classnames": "^2.1.2",
     "draft-js": "^0.7.0",
     "extract-text-webpack-plugin": "^0.9.1",
@@ -42,7 +43,7 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.0.0-beta.4",
-    "matrix-js-sdk": "^0.5.2",
+    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop",
     "modernizr": "^3.1.0",
     "q": "^1.4.1",