Merge branch 'master' into subscriptions

package.json

@@ -93,7 +93,8 @@
     "parse-duration": "^0.1.1",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
-    "react-apollo": "^1.0.0",
+    "prop-types": "^15.5.8",
+    "react-apollo": "^1.1.0",
     "react-recaptcha": "^2.2.6",
     "redis": "^2.7.1",
     "uuid": "^3.0.1",
@@ -102,7 +103,7 @@
     "semver": "^5.3.0"
   },
   "devDependencies": {
-    "apollo-client": "^1.0.0",
+    "apollo-client": "^1.0.4",
     "autoprefixer": "^6.5.2",
     "babel-cli": "^6.24.0",
     "babel-core": "^6.24.0",