Merge branch 'develop' into release/1.2.0

Author: adenvt

package-lock.json

@@ -42,7 +42,7 @@
     "node-sass": "^4.11.0",
     "offline-plugin": "^5.0.6",
     "pre-commit": "^1.2.2",
-    "prettier": "1.16.4",
+    "prettier": "1.17.0",
     "resolve-url-loader": "^3.1.0",
     "sass": "^1.18.0",
     "sass-loader": "^7.1.0",