Merge branch 'master' into bootstrap4

.travis.yml

@@ -7,7 +7,7 @@ addons:
     chrome: stable
 node_js:
  - 6
-install: make stamp-npm
+install: make node_modules
 before_script: make serve_bg
 script: make check
 sudo: false