Merge branch 'master' into latest

# Conflicts:
#	angular-cli/package.json
#	ngtools_webpack/package.json
#	systemjs_aot/package.json
#	webpack/package.json
#	webpack2/package.json

Merge branch 'master' into latest

Merge branch 'master' into latest

# Conflicts:
#	package.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-grid-react-example",
-  "version": "14.2.0",
+  "version": "15.0.0",
   "description": "Example Reach applicaiton using ag-Grid.",
   "main": "dist/ag-grid-react-example.js",
   "scripts": {
@@ -38,38 +38,39 @@
   },
   "homepage": "http://www.ag-grid.com/",
   "devDependencies": {
-    "babel-core": "6.26.x",
+    "babel-core": "6.24.x",
     "babel-loader": "6.4.x",
     "babel-preset-es2015": "6.24.x",
     "babel-preset-react": "6.24.x",
     "babel-preset-stage-0": "6.24.x",
     "babel-preset-stage-1": "6.24.x",
-    "css-loader": "0.28.x",
+    "css-loader": "0.23.x",
     "mkdirp": "0.5.1",
     "ncp": "2.0.0",
     "prop-types": "15.6.0",
     "rimraf": "2.5.x",
-    "style-loader": "0.19.x",
-    "webpack": "1.15.x",
-    "webpack-dev-server": "1.15.x",
+    "style-loader": "0.13.x",
+    "webpack": "1.12.x",
+    "webpack-dev-server": "1.14.x",
     "gulp": "3.9.x",
-    "gulp-typescript": "3.2.x",
+    "gulp-typescript": "3.1.x",
     "merge2": "1.0.x",
-    "typescript": "2.6.2",
-    "file-loader": "0.11.1"
+    "typescript": "2.3.x"
   },
   "dependencies": {
-    "ag-grid": "^15.0.0",
-    "ag-grid-enterprise": "^15.0.0",
-    "ag-grid-react": "^15.0.0",
+    "ag-grid": "^15.x",
+    "ag-grid-enterprise": "^15.x",
+    "ag-grid-react": "^15.x",
     "bootstrap": "3.3.7",
     "d3": "4.9.1",
+    "file-loader": "0.11.1",
     "lodash": "4.17.4",
-    "react": "16.2.x",
-    "react-dom": "16.2.x",
+    "react": "16.0.0",
+    "react-dom": "16.0.0",
     "react-dom-factories": "1.0.2",
     "react-redux": "5.0.x",
     "react-router-dom": "4.2.x",
-    "redux": "3.7.x"
+    "redux": "3.6.x",
+    "url-search-params-polyfill": "1.2.0"
   }
 }