Merge branch 'master' into close-nav-dropdown

package.json

@@ -29,22 +29,22 @@
     "babel-preset-es2015": "^6.9.0",
     "babel-preset-react": "^6.11.1",
     "babelify": "^7.3.0",
-    "bootstrap": "^3.3.6",
+    "bootstrap": "^3.3.7",
     "browser-sync": "^2.13.0",
-    "browserify": "^13.0.1",
+    "browserify": "^13.1.0",
     "classnames": "^2.2.5",
     "del": "^2.2.1",
     "engine.io-client": "^1.6.11",
     "eslint": "^3.0.1",
     "express": "^4.14.0",
-    "graceful-fs": "^4.1.4",
+    "graceful-fs": "^4.1.5",
     "gulp": "^3.9.1",
     "gulp-autoprefixer": "^3.1.0",
     "gulp-babel": "^6.1.2",
     "gulp-babel-istanbul": "^1.4.0",
     "gulp-concat": "^2.6.0",
     "gulp-eslint": "^3.0.1",
-    "gulp-imagemin": "^3.0.1",
+    "gulp-imagemin": "^3.0.2",
     "gulp-inject-modules": "^1.0.0",
     "gulp-jshint": "^2.0.1",
     "gulp-mocha": "^2.2.0",
@@ -60,25 +60,25 @@
     "history": "^3.0.0",
     "http-status-codes": "^1.0.6",
     "jquery": "^3.1.0",
-    "lodash": "^4.13.1",
-    "lodash.assign": "^4.0.9",
+    "lodash": "^4.14.1",
+    "lodash.assign": "^4.1.0",
     "loglevel": "^1.4.1",
     "markdownlint": "^0.2.0",
     "moment": "^2.14.1",
     "node-sass": "^3.8.0",
-    "plotly.js": "^1.14.2",
+    "plotly.js": "^1.15.0",
     "postcss-cli": "^2.5.2",
     "pretty-hrtime": "^1.0.2",
-    "react": "^15.2.1",
-    "react-bootstrap": "^0.30.0-rc.1",
-    "react-dom": "^15.2.1",
+    "react": "^15.3.0",
+    "react-bootstrap": "^0.30.0",
+    "react-dom": "^15.3.0",
     "react-input-autosize": "^1.1.0",
     "react-loader": "^2.4.0",
     "react-overlays": "^0.6.5",
-    "react-prop-types": "^0.3.2",
+    "react-prop-types": "^0.4.0",
     "react-redirect": "^1.0.0",
     "react-router": "^2.6.0",
-    "react-router-bootstrap": "^0.23.0",
+    "react-router-bootstrap": "^0.23.1",
     "react-select": "^1.0.0-beta14",
     "require-dir": "^0.3.0",
     "run-sequence": "^1.2.2",
@@ -91,10 +91,11 @@
   },
   "devDependencies": {
     "babel": "^6.5.2",
-    "babel-register": "^6.9.0",
+    "babel-register": "^6.11.6",
     "chai": "^3.5.0",
-    "coveralls": "^2.11.11",
+    "coveralls": "^2.11.12",
     "enzyme": "^2.4.1",
+    "eslint": "^3.2.0",
     "eslint-config-standard": "^5.3.5",
     "eslint-config-standard-jsx": "^2.0.0",
     "eslint-config-standard-react": "^3.0.0",
@@ -105,8 +106,8 @@
     "jshint": "^2.9.2",
     "jshint-stylish": "^2.2.0",
     "mocha": "^2.5.3",
-    "react-addons-test-utils": "^15.2.0",
-    "sinon": "^1.17.4",
+    "react-addons-test-utils": "^15.3.0",
+    "sinon": "^1.17.5",
     "stylelint": "^7.0.1",
     "stylelint-config-standard": "^11.0.0",
     "xmldom": "^0.1.22"

requirements/base.txt

@@ -1,5 +1,5 @@
-Django==1.9.8
-djangorestframework==3.4.0
+Django==1.10rc1
+djangorestframework==3.4.1
 django-filter==0.13.0
 django-crispy-forms==1.6.0
 pyver==1.0.38