Merge branch 'master' into BackendRefactor

Author: jackycute

package.json

@@ -164,6 +164,7 @@
     "optimize-css-assets-webpack-plugin": "^1.3.0",
     "script-loader": "^0.7.0",
     "standard": "^9.0.1",
+    "string-loader": "^0.0.1",
     "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",
     "webpack": "^1.14.0",