Merge branch 'master' into master

Author: asnowwolf

WEBPACK_UPDATE.md

@@ -54,6 +54,7 @@ Here is a summary of the file changes:
 
 Lastly, you can delete these files as they are not needed anymore.
   * `./config/karma-test-shim.js`
+  * `./config/environment.js`
   * `./src/system-config.ts`
   * `./angular-cli-build.js`
   * `./typings.json`

addon/ng2/blueprints/ng2/files/package.json

@@ -21,7 +21,6 @@
     "@angular/platform-browser-dynamic": "2.0.0-rc.5",
     "@angular/router": "3.0.0-rc.1",
     "core-js": "^2.4.0",
-    "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "ts-helpers": "^1.1.1",
     "zone.js": "0.6.12"