Merge branch 'master' into bug-killing-spree

Conflicts:
	client/coral-admin/src/routes/Moderation/components/UserDetail.js

package.json

@@ -99,6 +99,7 @@
     "mongoose": "^4.9.8",
     "morgan": "^1.8.1",
     "ms": "^2.0.0",
+    "murmurhash-js": "^1.0.0",
     "natural": "^0.5.0",
     "node-emoji": "^1.5.1",
     "node-fetch": "^1.6.3",
@@ -201,7 +202,6 @@
     "regenerator": "^0.8.46",
     "selenium-standalone": "^5.11.2",
     "style-loader": "^0.16.0",
-    "subscriptions-transport-ws": "^0.5.5-alpha.0",
     "supertest": "^2.0.1",
     "timeago.js": "^2.0.3",
     "webpack": "^2.3.1"