Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package.json

package.json

@@ -1,14 +1,12 @@
 {
   "name": "ag-grid-react-example",
-  "version": "9.1.0",
+  "version": "10.0.0",
   "description": "Example Reach applicaiton using ag-Grid.",
   "main": "dist/ag-grid-react-example.js",
   "scripts": {
     "full-width": "webpack-dev-server --config webpack.config.full-width.js --progress --colors --hot --inline",
     "standard": "webpack-dev-server --config webpack.config.standard.js --progress --colors --hot --inline",
-    "hoc": "webpack-dev-server --config webpack.config.hoc.js --progress --colors --hot --inline",
     "grouped": "webpack-dev-server --config webpack.config.grouped.js --progress --colors --hot --inline",
-    "trader": "webpack-dev-server --content-base src-trader-dashboard/ --config webpack.config.trader.js --progress --colors --hot --inline",
     "large": "webpack-dev-server --config webpack.config.large.js --progress --colors --hot --inline",
     "clean": "rimraf dist",
     "build-standard": "npm run clean && webpack --config webpack.config.standard.js --progress --profile --bail"
@@ -30,21 +28,20 @@
   },
   "homepage": "http://www.ag-grid.com/",
   "devDependencies": {
-    "babel-core": "^6.0.0",
+    "babel-core": "6.0.0",
     "babel-loader": "6.2.1",
     "babel-preset-es2015": "6.3.13",
     "babel-preset-react": "6.3.13",
-    "babel-preset-stage-1": "^6.24.1",
+    "babel-preset-stage-1": "6.24.1",
     "css-loader": "0.23.1",
     "style-loader": "0.13.0",
     "webpack": "1.12.11",
-    "webpack-dev-server": "^1.14.1"
+    "webpack-dev-server": "1.14.1"
   },
   "dependencies": {
-    "ag-grid": "9.1.x",
-    "ag-grid-api": "file:../ag-grid-api",
-    "ag-grid-enterprise": "9.1.x",
-    "ag-grid-react": "9.1.x",
+    "ag-grid": "10.0.x",
+    "ag-grid-enterprise": "10.0.x",
+    "ag-grid-react": "10.0.x",
     "d3": "^4.9.1",
     "lodash": "^4.17.4",
     "react": "15.5.x",
@@ -52,3 +49,5 @@
     "rimraf": "2.5.x"
   }
 }
+
+