Merge branch 'master' into yarn

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "start": "webpack-dev-server --config webpack.dev.js",
-    "test": "NODE_ENV=test npm run lint && jest",
+    "test": "NODE_ENV=test jest",
     "test:watch": "NODE_ENV=test jest --watch",
     "build": "webpack --config webpack.config.js",
     "storybook": "start-storybook -p 9001",
@@ -22,6 +22,7 @@
   "lint-staged": {
     "*.js": [
       "eslint --fix",
+      "jest --findRelatedTests",
       "git add"
     ],
     "*.css": [
@@ -55,8 +56,8 @@
     "exports-loader": "^0.6.3",
     "file-loader": "^0.8.5",
     "imports-loader": "^0.6.5",
-    "jest-cli": "^15.1.1",
-    "lint-staged": "^3.0.2",
+    "jest-cli": "^16.0.1",
+    "lint-staged": "^3.1.0",
     "node-sass": "^3.10.0",
     "npm-check": "^5.2.3",
     "postcss-cssnext": "^2.7.0",
@@ -82,8 +83,8 @@
     "bricks.js": "^1.7.0",
     "dateformat": "^1.0.12",
     "fuzzy": "^0.1.1",
-    "immutable": "^3.7.6",
     "immutability-helper": "^2.0.0",
+    "immutable": "^3.7.6",
     "js-base64": "^2.1.9",
     "js-yaml": "^3.5.3",
     "json-loader": "^0.5.4",
@@ -96,20 +97,20 @@
     "pluralize": "^3.0.0",
     "prismjs": "^1.5.1",
     "react": "^15.1.0",
-    "react-dom": "^15.1.0",
-    "react-hot-loader": "^3.0.0-beta.2",
     "react-addons-css-transition-group": "^15.3.1",
     "react-datetime": "^2.6.0",
-    "react-portal": "^2.2.1",
-    "react-simple-dnd": "^0.1.2",
-    "react-toolbox": "^1.2.1",
-    "react-waypoint": "^3.1.3",
+    "react-dom": "^15.1.0",
+    "react-hot-loader": "^3.0.0-beta.2",
     "react-immutable-proptypes": "^1.6.0",
     "react-lazy-load": "^3.0.3",
+    "react-portal": "^2.2.1",
     "react-pure-render": "^1.0.2",
     "react-redux": "^4.4.0",
     "react-router": "^2.5.1",
     "react-router-redux": "^4.0.5",
+    "react-simple-dnd": "^0.1.2",
+    "react-toolbox": "^1.2.1",
+    "react-waypoint": "^3.1.3",
     "redux": "^3.3.1",
     "redux-thunk": "^1.0.3",
     "selection-position": "^1.0.0",