Merge branch 'master' into refactor

Author: naveed-ahmad

package.json

@@ -33,6 +33,10 @@
       "npm run prettier",
       "npm run lint:fix",
       "git add"
+    ],
+    "*.scss": [
+      "npm run prettier",
+      "git add"
     ]
   },
   "engines": {
@@ -184,7 +188,7 @@
     "phantomjs-polyfill": "0.0.1",
     "piping": "0.3.0",
     "pre-commit": "1.1.3",
-    "prettier": "^1.2.2",
+    "prettier": "^1.5.2",
     "react-addons-test-utils": "15.4.1",
     "react-transform-catch-errors": "1.0.0",
     "react-transform-hmr": "1.0.1",