Merge branch 'develop' into matthew/slate

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -25,7 +25,8 @@
     "release.sh",
     "scripts",
     "src",
-    "test"
+    "test",
+    "res"
   ],
   "bin": {
     "reskindex": "scripts/reskindex.js",
@@ -71,8 +72,8 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "lolex": "^2.3.2",
-    "matrix-js-sdk": "0.10.1",
+    "lolex": "2.3.2",
+    "matrix-js-sdk": "0.10.2",
     "optimist": "^0.6.1",
     "pako": "^1.0.5",
     "prop-types": "^15.5.8",