Merge remote-tracking branch 'upstream/develop' into feature-autocomplete

package.json

@@ -16,10 +16,12 @@
     "reskindex": "reskindex -h header",
     "build": "babel src -d lib --source-maps",
     "start": "babel src -w -d lib --source-maps",
+    "lint": "eslint src/",
+    "lintall": "eslint src/ test/",
     "clean": "rimraf lib",
     "prepublish": "npm run build && git rev-parse HEAD > git-revision.txt",
-    "test": "karma start --browsers PhantomJS",
-    "test-multi": "karma start --single-run=false"
+    "test": "karma start $KARMAFLAGS --browsers PhantomJS",
+    "test-multi": "karma start $KARMAFLAGS --single-run=false"
   },
   "dependencies": {
     "classnames": "^2.1.2",
@@ -55,8 +57,12 @@
   "devDependencies": {
     "babel": "^5.8.23",
     "babel-core": "^5.8.38",
+    "babel-eslint": "^6.1.0",
     "babel-loader": "^5.4.0",
     "babel-polyfill": "^6.5.0",
+    "eslint": "^2.13.1",
+    "eslint-plugin-flowtype": "^2.3.0",
+    "eslint-plugin-react": "^5.2.2",
     "expect": "^1.16.0",
     "json-loader": "^0.5.3",
     "karma": "^0.13.22",