Merge branch 'master' of github.com:LLK/scratch-gui into greenkeeper/xhr-2.4.0

# Conflicts:
#	package.json

package.json

@@ -27,18 +27,18 @@
   },
   "devDependencies": {
     "autoprefixer": "6.7.2",
-    "babel-core": "6.22.1",
+    "babel-core": "6.23.1",
     "babel-eslint": "7.1.1",
-    "babel-loader": "6.3.0",
+    "babel-loader": "6.3.2",
     "babel-plugin-transform-object-rest-spread": "6.22.0",
     "babel-preset-es2015": "6.22.0",
     "babel-preset-react": "6.22.0",
     "classnames": "2.2.5",
     "copy-webpack-plugin": "4.0.1",
     "css-loader": "0.26.1",
-    "eslint": "3.15.0",
+    "eslint": "3.16.0",
     "eslint-config-scratch": "^3.0.0",
-    "eslint-plugin-react": "6.9.0",
+    "eslint-plugin-react": "6.10.0",
     "gh-pages": "0.12.0",
     "html-webpack-plugin": "2.28.0",
     "husky": "0.13.1",
@@ -49,7 +49,7 @@
     "lodash.pick": "4.4.0",
     "minilog": "3.1.0",
     "opt-cli": "1.5.1",
-    "postcss-loader": "1.2.2",
+    "postcss-loader": "1.3.1",
     "postcss-modules-values": "1.2.2",
     "react": "15.4.2",
     "react-dom": "15.4.2",
@@ -63,11 +63,11 @@
     "scratch-vm": "latest",
     "style-loader": "0.13.1",
     "svg-to-image": "1.1.3",
-    "svg-url-loader": "2.0.1",
+    "svg-url-loader": "2.0.2",
     "travis-after-all": "1.4.4",
     "webpack": "2.2.1",
     "webpack-combine-loaders": "2.0.3",
-    "webpack-dev-server": "2.3.0",
+    "webpack-dev-server": "2.4.1",
     "xhr": "2.4.0"
   }
 }