Merge branch 'master' into admin-login-upgrade

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:7
+FROM node:7.6
 
 # Install yarn
 RUN npm install -g yarn

circle.yml

@@ -1,6 +1,6 @@
 machine:
   node:
-    version: 7
+    version: 7.6
   services:
     - docker
     - redis

package.json

@@ -165,6 +165,6 @@
     "webpack": "^2.2.1"
   },
   "engines": {
-    "node": ">=7.0.0"
+    "node": "~7.6.0"
   }
 }