Merge branch 'master' of https://github.com/gaearon/redux

pull in most recent changes

Author: mattybow

examples/counter/webpack.config.js

@@ -18,11 +18,11 @@ module.exports = {
     new webpack.NoErrorsPlugin()
   ],
   resolve: {
-    extensions: ['', '.js', '.jsx']
+    extensions: ['', '.js']
   },
   module: {
     loaders: [{
-      test: /\.js?$/,
+      test: /\.js$/,
       loaders: ['react-hot', 'babel'],
       exclude: /node_modules/
     }]

examples/todomvc/webpack.config.js

@@ -18,11 +18,11 @@ module.exports = {
     new webpack.NoErrorsPlugin()
   ],
   resolve: {
-    extensions: ['', '.js', '.jsx']
+    extensions: ['', '.js']
   },
   module: {
     loaders: [{
-      test: /\.js?$/,
+      test: /\.js$/,
       loaders: ['react-hot', 'babel'],
       exclude: /node_modules/
     }, {