Merge branch 'master' into develop

package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -64,6 +64,7 @@
     "test-multi": "karma start"
   },
   "dependencies": {
+    "babel-plugin-transform-async-to-bluebird": "^1.1.1",
     "babel-polyfill": "^6.26.0",
     "babel-runtime": "^6.26.0",
     "browser-request": "^0.3.3",
@@ -71,8 +72,8 @@
     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-js-sdk": "2.4.6",
+    "matrix-react-sdk": "1.7.5",
     "modernizr": "^3.6.0",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "postcss-easings": "^2.0.0",