Merge branch 'develop'

Author: birdofpreyru

package.json

@@ -46,6 +46,7 @@
     "babel-preset-stage-2": "^6.22.0",
     "babel-register": "^6.24.0",
     "body-parser": "^1.17.1",
+    "browserslist": "2.1.5",
     "browser-cookies": "^1.1.0",
     "classnames": "^2.2.5",
     "config": "^1.25.1",