Merge branch 'master' of https://github.com/RyanCCollins/scalable-react-boilerplate into feat_rc_server_rendering

Author: RyanCCollins

.eslintrc

@@ -8,7 +8,12 @@
   },
   "rules": {
     "func-names": 0,
-    "eol-last": 0
+    "eol-last": 0,
+    "react/jsx-no-bind": [ 2, {
+      "ignoreRefs": false,
+      "allowArrowFunctions": true,
+      "allowBind": true
+    }]
   },
   "plugins": [
     "react",

README.md

@@ -27,6 +27,10 @@ Below are a few example apps that have been built with this project
     - [See the Code](https://github.com/RyanCCollins/restaurant-reviewer) 
     - [See the Working App](http://restaurant-reviewer-client.herokuapp.com/)
 
+## Experimental Features
+### Server Rendering
+Need an extra performance boost with React Server Rendering, code chunking and lazy loading?  Take a look at [this branch](https://github.com/RyanCCollins/scalable-react-boilerplate/tree/feat_rc_server_rendering) for an example.
+
 ### Docker Support
 Coming soon the app will support Docker, which will contain a configured web server to make deployment of this boilerplate simple!  You can take a look at [this branch](https://github.com/RyanCCollins/scalable-react-boilerplate/tree/feat_rc_docker_config) for more details.
 

package.json

@@ -83,7 +83,7 @@
     "babel-core": "^6.3.15",
     "babel-loader": "^6.2.0",
     "babel-polyfill": "latest",
-    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-es2015": "^6.9.0",
     "babel-preset-react": "^6.3.13",
     "babel-preset-stage-0": "^6.3.13",
     "components": "^0.1.0",
@@ -128,7 +128,6 @@
     "babel-eslint": "^5.0.0-beta4",
     "babel-jest": "^15.0.0",
     "babel-plugin-webpack-loaders": "^0.7.1",
-    "babel-preset-es2015": "^6.9.0",
     "cross-env": "^2.0.0",
     "enzyme": "^2.4.1",
     "enzyme-to-json": "^1.0.3",