Merge branch 'master' of github.com:coralproject/talk into e2e-env-fix

package.json

@@ -10,8 +10,8 @@
     "build-watch": "NODE_ENV=development webpack --config webpack.config.dev.js --watch",
     "lint": "eslint bin/* .",
     "lint-fix": "eslint bin/* . --fix",
-    "test": "TEST_MODE=unit NODE_ENV=test mocha --compilers js:babel-core/register tests/helpers/*.js --require ignore-styles --recursive tests",
-    "test-watch": "TEST_MODE=unit NODE_ENV=test mocha --compilers js:babel-core/register --recursive -w tests",
+    "test": "TEST_MODE=unit NODE_ENV=test mocha -R ${NPM_PACKAGE_CONFIG_MOCHA_REPORTER:-spec}",
+    "test-cover": "TEST_MODE=unit NODE_ENV=test istanbul cover _mocha --report text --check-coverage -- -R spec",
     "pree2e": "NODE_ENV=test scripts/pree2e.sh",
     "e2e": "NODE_ENV=test nightwatch",
     "poste2e": "NODE_ENV=test scripts/poste2e.sh",
@@ -49,18 +49,24 @@
   },
   "homepage": "https://github.com/coralproject/talk#readme",
   "dependencies": {
+    "apollo-client": "^0.7.3",
     "bcrypt": "^0.8.7",
     "body-parser": "^1.15.2",
     "cli-table": "^0.3.1",
     "commander": "^2.9.0",
     "connect-redis": "^3.1.0",
     "csurf": "^1.9.0",
+    "dataloader": "^1.2.0",
     "debug": "^2.2.0",
     "dotenv": "^4.0.0",
     "ejs": "^2.5.2",
     "env-rewrite": "^1.0.2",
     "express": "^4.14.0",
     "express-session": "^1.14.2",
+    "graphql": "^0.8.2",
+    "graphql-server-express": "^0.5.0",
+    "graphql-tag": "^1.2.3",
+    "graphql-tools": "^0.9.0",
     "helmet": "^3.1.0",
     "jsonwebtoken": "^7.1.9",
     "kue": "^0.11.5",
@@ -75,6 +81,7 @@
     "passport-facebook": "^2.1.1",
     "passport-local": "^1.0.0",
     "prompt": "^1.0.0",
+    "react-apollo": "^0.8.1",
     "redis": "^2.6.3",
     "uuid": "^2.0.3"
   },
@@ -116,6 +123,7 @@
     "ignore-styles": "^5.0.1",
     "immutable": "^3.8.1",
     "imports-loader": "^0.6.5",
+    "istanbul": "^1.1.0-alpha.1",
     "jsdom": "^9.8.3",
     "json-loader": "^0.5.4",
     "keymaster": "^1.6.2",