Merge branch 'master' into status-history

package.json

@@ -11,18 +11,15 @@
     "lint-fix": "eslint . --fix",
     "test": "NODE_ENV=test mocha --compilers js:babel-core/register --recursive tests",
     "test-watch": "NODE_ENV=test mocha --compilers js:babel-core/register --recursive -w tests",
+    "pree2e": "NODE_ENV=test ./pree2e.sh",
+    "e2e": "NODE_ENV=test node_modules/.bin/nightwatch",
     "embed-start": "NODE_ENV=development npm run build && ./bin/cli serve --jobs"
   },
   "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 +28,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": {
@@ -111,6 +103,8 @@
     "material-design-lite": "^1.2.1",
     "mocha": "^3.1.2",
     "mocha-junit-reporter": "^1.12.1",
+    "nightwatch": "^0.9.9",
+    "node-fetch": "^1.6.3",
     "postcss-loader": "^1.1.0",
     "postcss-modules": "^0.5.2",
     "postcss-smart-import": "^0.5.1",
@@ -128,11 +122,11 @@
     "redux-mock-store": "^1.2.1",
     "redux-thunk": "^2.1.0",
     "regenerator": "^0.8.46",
+    "selenium-standalone": "^5.8.0",
     "style-loader": "^0.13.1",
     "supertest": "^2.0.1",
     "timeago.js": "^2.0.3",
-    "webpack": "^1.13.3",
-    "whatwg-fetch": "^1.0.0"
+    "webpack": "^1.13.3"
   },
   "engines": {
     "node": ">=7.0.0"