Merge branch 'master' into master

Author: hollannikas

.editorconfig

@@ -6,7 +6,6 @@ root = true
 charset = utf-8
 indent_style = space
 indent_size = 2
-end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 

packages/angular-cli/blueprints/ng2/files/.editorconfig

@@ -5,7 +5,6 @@ root = true
 charset = utf-8
 indent_style = space
 indent_size = 2
-end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 

tests/e2e/assets/webpack/test-app/package.json

@@ -4,7 +4,7 @@
   "dependencies": {
     "@angular/common": "~2.1.0",
     "@angular/compiler": "~2.1.0",
-    "@angular/compiler-cli": "0.6.2",
+    "@angular/compiler-cli": "~2.1.0",
     "@angular/core": "~2.1.0",
     "@angular/http": "~2.1.0",
     "@angular/platform-browser": "~2.1.0",