Merge branch 'develop'

Author: george

package.json

@@ -14,7 +14,7 @@
     "setup": "npm i && npm run js:build",
     "watch": "npm run js:build && webpack-dev-server --config webpack.dev.js --progress",
     "build": "npm run js:build && webpack --config webpack.prod.js --progress",
-    "build:quiet": "webpack --config webpack.prod.js --quiet",
+    "build:quiet": "webpack --config webpack.prod.js --display minimal",
     "test": "jest",
     "test:watch": "jest --watch",
     "lint": "eslint . --ext .js -c .eslintrc.js --ignore-path .eslintignore; exit 0",