Merge branch 'master' of github.com:coralproject/talk into passport

package.json

@@ -16,13 +16,8 @@
   "config": {
     "pre-git": {
       "commit-msg": [],
-      "pre-commit": [
-        "npm run lint",
-        "npm test"
-      ],
-      "pre-push": [
-        "npm test"
-      ],
+      "pre-commit": ["npm run lint", "npm test"],
+      "pre-push": ["npm test"],
       "post-commit": [],
       "post-merge": []
     }
@@ -31,12 +26,7 @@
     "type": "git",
     "url": "git+https://github.com/coralproject/talk.git"
   },
-  "keywords": [
-    "talk",
-    "coral",
-    "coralproject",
-    "ask"
-  ],
+  "keywords": ["talk", "coral", "coralproject", "ask"],
   "author": "",
   "license": "Apache-2.0",
   "bugs": {
@@ -55,11 +45,14 @@
     "express-session": "^1.14.2",
     "helmet": "^3.1.0",
     "lodash.debounce": "^4.0.8",
+    "jsonwebtoken": "^7.1.9",
+    "lodash": "^4.16.6",
     "mongoose": "^4.6.5",
     "morgan": "^1.7.0",
     "passport": "^0.3.2",
     "passport-facebook": "^2.1.1",
     "passport-local": "^1.0.0",
+    "nodemailer": "^2.6.4",
     "prompt": "^1.0.0",
     "redis": "^2.6.3",
     "uuid": "^2.0.3"