Merge branch 'master' into master

Author: asnowwolf

README.md

@@ -22,6 +22,8 @@ We're updating the build system in Angular-CLI to use webpack instead of Broccol
 
 You can install and update your projects using [these instructions](https://github.com/angular/angular-cli/blob/master/WEBPACK_UPDATE.md).
 
+**The current instructions on this file reflect usage for the `webpack` version.**
+
 ## Prerequisites
 
 The generated project has dependencies that require **Node 4 or greater**.

addon/ng2/blueprints/ng2/files/__path__/tsconfig.json

@@ -12,9 +12,6 @@
     "target": "es5",
     "typeRoots": [
       "../node_modules/@types"
-    ],
-    "types": [
-      "jasmine"
     ]
   }
 }

addon/ng2/blueprints/ng2/files/config/karma.conf.js

@@ -19,10 +19,10 @@ module.exports = function (config) {
       }
     },
     files: [
-      { pattern: './src/test.ts', watched: false }
+      { pattern: './<%= sourceDir %>/test.ts', watched: false }
     ],
     preprocessors: {
-      './src/test.ts': ['angular-cli']
+      './<%= sourceDir %>/test.ts': ['angular-cli']
     },
     remapIstanbulReporter: {
       reports: {

package.json

@@ -37,7 +37,7 @@
     "@types/rimraf": "0.0.25-alpha",
     "@types/webpack": "^1.12.22-alpha",
     "angular2-template-loader": "^0.4.0",
-    "awesome-typescript-loader": "^2.1.1",
+    "awesome-typescript-loader": "^2.2.1",
     "chalk": "^1.1.3",
     "compression-webpack-plugin": "^0.3.1",
     "copy-webpack-plugin": "^3.0.1",