Merge branch 'master' into i18n-refactor

package.json

@@ -75,16 +75,18 @@
     "graphql-subscriptions": "^0.3.1",
     "graphql-tools": "^0.10.1",
     "helmet": "^3.5.0",
+    "immutability-helper": "^2.2.0",
     "inquirer": "^3.0.6",
     "joi": "^10.4.1",
     "jsonwebtoken": "^7.3.0",
+    "jwt-decode": "^2.2.0",
     "kue": "^0.11.5",
     "linkify-it": "^2.0.3",
     "lodash": "^4.16.6",
     "marked": "^0.3.6",
     "metascraper": "^1.0.6",
     "minimist": "^1.2.0",
-    "mongoose": "^4.9.1",
+    "mongoose": "^4.9.8",
     "morgan": "^1.8.1",
     "natural": "^0.5.0",
     "node-emoji": "^1.5.1",
@@ -92,6 +94,7 @@
     "nodemailer": "^2.6.4",
     "parse-duration": "^0.1.1",
     "passport": "^0.3.2",
+    "passport-jwt": "^2.2.1",
     "passport-local": "^1.0.0",
     "prop-types": "^15.5.8",
     "react-apollo": "^1.1.0",
@@ -102,9 +105,9 @@
     "semver": "^5.3.0",
     "simplemde": "^1.11.2",
     "subscriptions-transport-ws": "^0.5.5-alpha.0",
+    "timekeeper": "^1.0.0",
     "uuid": "^3.0.1",
-    "yaml-loader": "^0.4.0",
-    "yamljs": "^0.2.10"
+    "yaml-loader": "^0.4.0"
   },
   "devDependencies": {
     "apollo-client": "^1.0.4",