diff --git a/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts b/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts
index 33ee6b57ea7d..648c5d48cd04 100644
--- a/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts
+++ b/addon/ng2/blueprints/component/files/__path__/__name__.component.spec.ts
@@ -10,7 +10,7 @@ import {
   ComponentFixture,
   TestComponentBuilder
 } from 'angular2/testing';
-import {<%= classifiedModuleName %>Component} from './<%= dasherizedModuleName %>.component';
+import { <%= classifiedModuleName %>Component } from './<%= dasherizedModuleName %>.component';
 
 describe('Component: <%= classifiedModuleName %>', () => {
   beforeEachProviders(() => [<%= classifiedModuleName %>Component]);
@@ -18,5 +18,4 @@ describe('Component: <%= classifiedModuleName %>', () => {
   it('should create the component', inject([<%= classifiedModuleName %>Component], (component: <%= classifiedModuleName %>Component) => { 
     expect(component).toBeTruthy(); 
   })); 
-
 });
diff --git a/addon/ng2/blueprints/component/files/__path__/__name__.component.ts b/addon/ng2/blueprints/component/files/__path__/__name__.component.ts
index 468d4b9de2c3..48646194894e 100644
--- a/addon/ng2/blueprints/component/files/__path__/__name__.component.ts
+++ b/addon/ng2/blueprints/component/files/__path__/__name__.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit} from 'angular2/core';
+import { Component, OnInit } from 'angular2/core';
 
 @Component({
   moduleId: __moduleName,
diff --git a/addon/ng2/blueprints/component/files/__path__/index.ts b/addon/ng2/blueprints/component/files/__path__/index.ts
index 40f21b7c040c..876f94aebd5f 100644
--- a/addon/ng2/blueprints/component/files/__path__/index.ts
+++ b/addon/ng2/blueprints/component/files/__path__/index.ts
@@ -1,2 +1 @@
-export {<%= classifiedModuleName %>Component} from './<%= dasherizedModuleName %>.component';
-
+export { <%= classifiedModuleName %>Component } from './<%= dasherizedModuleName %>.component';
diff --git a/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts b/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts
index 3778644742d5..0963b22c720b 100644
--- a/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts
+++ b/addon/ng2/blueprints/directive/files/__path__/__name__.directive.spec.ts
@@ -10,8 +10,8 @@ import {
   ComponentFixture,
   TestComponentBuilder
 } from 'angular2/testing';
-import {provide, Component} from 'angular2/core';
-import {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>.directive';
+import { provide, Component } from 'angular2/core';
+import { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.directive';
 
 @Component({
   selector: 'test-component',
@@ -20,14 +20,11 @@ import {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>.directi
 class TestComponent {}
 
 describe('<%= classifiedModuleName %> Directive', () => {
-
   beforeEachProviders((): any[] => []);
 
-
   it('should ...', async(inject([TestComponentBuilder], (tcb:TestComponentBuilder) => {
     return tcb.createAsync(TestComponent).then((fixture: ComponentFixture) => {
       fixture.detectChanges();
     });
   })));
-
 });
diff --git a/addon/ng2/blueprints/directive/files/__path__/__name__.directive.ts b/addon/ng2/blueprints/directive/files/__path__/__name__.directive.ts
index 9857b0ca6ff7..3bf4346ae8b3 100644
--- a/addon/ng2/blueprints/directive/files/__path__/__name__.directive.ts
+++ b/addon/ng2/blueprints/directive/files/__path__/__name__.directive.ts
@@ -1,4 +1,4 @@
-import {Directive} from 'angular2/core';
+import { Directive } from 'angular2/core';
 
 @Directive({
   selector: '[<%= rawEntityName %>]'
diff --git a/addon/ng2/blueprints/ng2/files/.editorconfig b/addon/ng2/blueprints/ng2/files/.editorconfig
new file mode 100644
index 000000000000..20380c701c90
--- /dev/null
+++ b/addon/ng2/blueprints/ng2/files/.editorconfig
@@ -0,0 +1,14 @@
+# http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = 0
+trim_trailing_whitespace = false
diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.spec.ts b/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.spec.ts
index 43fbd7e4929b..c6e239e92044 100644
--- a/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.spec.ts
+++ b/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.spec.ts
@@ -10,12 +10,12 @@ import {
   ComponentFixture,
   TestComponentBuilder
 } from 'angular2/testing';
-import {<%= jsComponentName %>App} from '../app/<%= htmlComponentName %>.component';
+import { <%= jsComponentName %>AppComponent } from '../app/<%= htmlComponentName %>.component';
 
-beforeEachProviders(() => [<%= jsComponentName %>App]);
+beforeEachProviders(() => [<%= jsComponentName %>AppComponent]);
 
 describe('App: <%= jsComponentName %>', () => {  
-  it('should create the app', inject([<%= jsComponentName %>App], (app: <%= jsComponentName %>App) => { 
+  it('should create the app', inject([<%= jsComponentName %>AppComponent], (app: <%= jsComponentName %>AppComponent) => { 
     expect(app).toBeTruthy(); 
   })); 
 });
diff --git a/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.ts b/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.ts
index bd4671245f93..02d4e738237b 100644
--- a/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.ts
+++ b/addon/ng2/blueprints/ng2/files/__path__/app/__name__.component.ts
@@ -1,4 +1,4 @@
-import {Component} from 'angular2/core';
+import { Component } from 'angular2/core';
 
 @Component({
   moduleId: __moduleName,
@@ -6,5 +6,5 @@ import {Component} from 'angular2/core';
   templateUrl: '<%= htmlComponentName %>.component.html',
   styleUrls: ['<%= dasherizedModuleName %>.component.<%= styleExt %>']
 })
-export class <%= jsComponentName %>App {
+export class <%= jsComponentName %>AppComponent {
 }
diff --git a/addon/ng2/blueprints/ng2/files/__path__/icon.png b/addon/ng2/blueprints/ng2/files/__path__/icon.png
new file mode 100644
index 000000000000..4dace951fab2
Binary files /dev/null and b/addon/ng2/blueprints/ng2/files/__path__/icon.png differ
diff --git a/addon/ng2/blueprints/ng2/files/__path__/index.html b/addon/ng2/blueprints/ng2/files/__path__/index.html
index 5e057f9f548c..085e21cab244 100644
--- a/addon/ng2/blueprints/ng2/files/__path__/index.html
+++ b/addon/ng2/blueprints/ng2/files/__path__/index.html
@@ -5,7 +5,8 @@
   <title><%= jsComponentName %></title>
   <base href="/">
   {{content-for 'head'}}
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link rel="icon" type="image/x-icon" href="favicon.ico"><% if (isMobile) { %>
+  <link rel="manifest" href="/manifest.webapp"><% } %>
 
   <!-- Service worker support is disabled by default.
        Install the worker script and uncomment to enable.
diff --git a/addon/ng2/blueprints/ng2/files/__path__/main.ts b/addon/ng2/blueprints/ng2/files/__path__/main.ts
index c1ff751cc525..35e9962ff7aa 100644
--- a/addon/ng2/blueprints/ng2/files/__path__/main.ts
+++ b/addon/ng2/blueprints/ng2/files/__path__/main.ts
@@ -1,10 +1,10 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {enableProdMode} from 'angular2/core';
-import {environment} from './app/environment';
-import {<%= jsComponentName %>App} from './app/<%= htmlComponentName %>.component';
+import { bootstrap } from 'angular2/platform/browser';
+import { enableProdMode } from 'angular2/core';
+import { environment } from './app/environment';
+import { <%= jsComponentName %>AppComponent } from './app/<%= htmlComponentName %>.component';
 
 if (environment.production) {
   enableProdMode();
 }
 
-bootstrap(<%= jsComponentName %>App);
+bootstrap(<%= jsComponentName %>AppComponent);
diff --git a/addon/ng2/blueprints/ng2/files/__path__/manifest.webapp b/addon/ng2/blueprints/ng2/files/__path__/manifest.webapp
new file mode 100644
index 000000000000..d4ad5e1ab6c2
--- /dev/null
+++ b/addon/ng2/blueprints/ng2/files/__path__/manifest.webapp
@@ -0,0 +1,13 @@
+{
+  "name": "<%= fullAppName %>",
+  "icons": [
+    {
+      "src": "icon.png",
+      "sizes": "96x96",
+      "type": "image/png"
+    }
+  ],
+  "start_url": "/index.html",
+  "display": "standalone",
+  "orientation": "portrait"
+}
diff --git a/addon/ng2/blueprints/ng2/index.js b/addon/ng2/blueprints/ng2/index.js
index a458837e6a0d..aa4d30bc59ad 100644
--- a/addon/ng2/blueprints/ng2/index.js
+++ b/addon/ng2/blueprints/ng2/index.js
@@ -1,3 +1,4 @@
+const Blueprint   = require('ember-cli/lib/models/blueprint');
 const path        = require('path');
 const stringUtils = require('ember-cli-string-utils');
 
@@ -6,27 +7,47 @@ module.exports = {
   
   availableOptions: [
     { name: 'source-dir', type: String, default: 'src', aliases: ['sd'] },
-    { name: 'prefix', type: String, default: 'app', aliases: ['p'] }
+    { name: 'prefix', type: String, default: 'app', aliases: ['p'] },
+    { name: 'mobile', type: Boolean, default: false }
   ],
 
   locals: function(options) {
     //TODO: pull value from config
     this.styleExt = 'css';
     this.version = require(path.resolve(__dirname, '..', '..', '..', '..', 'package.json')).version;
-    
+
     // Join with / not path.sep as reference to typings require forward slashes.
     const refToTypings = options.sourceDir.split(path.sep).map(() => '..').join('/');
+    const fullAppName = stringUtils.dasherize(options.entity.name)
+      .replace(/-(.)/g, (_, l) => ' ' + l.toUpperCase())
+      .replace(/^./, (l) => l.toUpperCase());
+
     return {
       htmlComponentName: stringUtils.dasherize(options.entity.name),
       jsComponentName: stringUtils.classify(options.entity.name),
+      fullAppName: fullAppName,
       styleExt: this.styleExt,
       version: this.version,
       sourceDir: options.sourceDir,
       prefix: options.prefix,
-      refToTypings: refToTypings
+      refToTypings: refToTypings,
+      isMobile: options.mobile
     };
   },
-  
+
+  files: function() {
+    var fileList = Blueprint.prototype.files.call(this);
+
+    if (this.options && !this.options.mobile) {
+      fileList = fileList.filter(p => {
+        return p != path.join('__path__', 'manifest.webapp')
+            && p != path.join('__path__', 'icon.png');
+      });
+    }
+
+    return fileList;
+  },
+
   fileMapTokens: function (options) {
     // Return custom template variables here.
     return {
diff --git a/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts b/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts
index b120cdd7bf91..8e3facc8701d 100644
--- a/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts
+++ b/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.spec.ts
@@ -8,15 +8,13 @@ import {
   TestComponentBuilder,
   beforeEachProviders
 } from 'angular2/testing';
-import {provide} from 'angular2/core';
-import {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>.pipe';
+import { provide } from 'angular2/core';
+import { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.pipe';
 
 describe('<%= classifiedModuleName %> Pipe', () => {
-
   beforeEachProviders(() => [<%= classifiedModuleName%>]);
 
   it('should transform the input', inject([<%= classifiedModuleName %>], (pipe:<%= classifiedModuleName %>) => {
       expect(pipe.transform(true)).toBe(null);
   }));
-
 });
diff --git a/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.ts b/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.ts
index 83f1389e262f..fd78a4b15e65 100644
--- a/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.ts
+++ b/addon/ng2/blueprints/pipe/files/__path__/__name__.pipe.ts
@@ -1,4 +1,4 @@
-import {Pipe, PipeTransform} from 'angular2/core';
+import { Pipe, PipeTransform } from 'angular2/core';
 
 @Pipe({
   name: '<%= camelizedModuleName %>'
diff --git a/addon/ng2/blueprints/pipe/files/__path__/index.ts b/addon/ng2/blueprints/pipe/files/__path__/index.ts
index 1380a23dc3f5..7722395a535f 100644
--- a/addon/ng2/blueprints/pipe/files/__path__/index.ts
+++ b/addon/ng2/blueprints/pipe/files/__path__/index.ts
@@ -1 +1 @@
-export {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>.pipe';
\ No newline at end of file
+export { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.pipe';
\ No newline at end of file
diff --git a/addon/ng2/blueprints/route/index.js b/addon/ng2/blueprints/route/index.js
index 971e6bb5d766..23718475584d 100644
--- a/addon/ng2/blueprints/route/index.js
+++ b/addon/ng2/blueprints/route/index.js
@@ -33,7 +33,7 @@ function _insertImport(content, symbolName, fileName) {
           + content.substr(m.index + m[0].length);
   }
 
-  const importTemplate = `import {${symbolName}} from '${fileName}';`;
+  const importTemplate = `import { ${symbolName} } from '${fileName}';`;
   // Find the last import and add an import to it.
   content = content.replace(/(import.+)\n(?!import)/m, function (f, m1) {
     return `${m1}\n${importTemplate}\n`;
diff --git a/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts b/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts
index e2c629499d21..2b5328da0cd9 100644
--- a/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts
+++ b/addon/ng2/blueprints/service/files/__path__/__name__.service.spec.ts
@@ -8,8 +8,8 @@ import {
   expect,
   inject
 } from 'angular2/testing';
-import {provide} from 'angular2/core';
-import {<%= classifiedModuleName %>Service} from './<%= dasherizedModuleName %>.service';
+import { provide } from 'angular2/core';
+import { <%= classifiedModuleName %>Service } from './<%= dasherizedModuleName %>.service';
 
 describe('<%= classifiedModuleName %> Service', () => {
 
diff --git a/addon/ng2/blueprints/service/files/__path__/__name__.service.ts b/addon/ng2/blueprints/service/files/__path__/__name__.service.ts
index 2c95b60e6a76..f030bfaee189 100644
--- a/addon/ng2/blueprints/service/files/__path__/__name__.service.ts
+++ b/addon/ng2/blueprints/service/files/__path__/__name__.service.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/core';
+import { Injectable } from 'angular2/core';
 
 @Injectable()
 export class <%= classifiedModuleName %>Service {
diff --git a/addon/ng2/commands/generate.ts b/addon/ng2/commands/generate.ts
index 3a5bbf177353..3c01409d2cf2 100644
--- a/addon/ng2/commands/generate.ts
+++ b/addon/ng2/commands/generate.ts
@@ -2,7 +2,9 @@ import * as EmberGenerateCommand from 'ember-cli/lib/commands/generate';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as SilentError from 'silent-error';
-
+var chalk = require('chalk');
+import * as Blueprint from 'ember-cli/lib/models/blueprint';
+var EOL = require('os').EOL;
 
 const GenerateCommand = EmberGenerateCommand.extend({
   name: 'generate',
@@ -15,10 +17,28 @@ const GenerateCommand = EmberGenerateCommand.extend({
     // map the blueprint name to allow for aliases
     rawArgs[0] = mapBlueprintName(rawArgs[0]);
 
-    if (!fs.existsSync(path.join(__dirname, '..', 'blueprints', rawArgs[0]))) {
+    if (rawArgs[0] !== '--help' &&
+      !fs.existsSync(path.join(__dirname, '..', 'blueprints', rawArgs[0]))) {
       SilentError.debugOrThrow('angular-cli/commands/generate', `Invalid blueprint: ${rawArgs[0]}`);
     }
-
+    
+    // Override default help to hide ember blueprints
+    EmberGenerateCommand.prototype.printDetailedHelp = function (options) {
+      var blueprintList = fs.readdirSync(path.join(__dirname, '..', 'blueprints'));
+      var blueprints = blueprintList
+        .filter(bp => bp.indexOf('-test') === -1)
+        .filter(bp => bp !== 'ng2')
+        .map(bp => Blueprint.load(path.join(__dirname, '..', 'blueprints', bp)));
+      
+      var output = '';
+      blueprints
+        .forEach(function (bp) {
+          output += bp.printBasicHelp(false) + EOL;
+        });
+      this.ui.writeLine(chalk.cyan('  Available blueprints'));
+      this.ui.writeLine(output);
+    };
+    
     return EmberGenerateCommand.prototype.beforeRun.apply(this, arguments);
   }
 });
diff --git a/addon/ng2/commands/init.js b/addon/ng2/commands/init.js
index a05b1ffbe3d3..2207712ba248 100644
--- a/addon/ng2/commands/init.js
+++ b/addon/ng2/commands/init.js
@@ -21,7 +21,8 @@ module.exports = Command.extend({
     { name: 'skip-bower', type: Boolean, default: true, aliases: ['sb'] },
     { name: 'name', type: String, default: '', aliases: ['n'] },
     { name: 'source-dir', type: String, default: 'src', aliases: ['sd'] },
-    { name: 'prefix', type: String, default: 'app', aliases: ['p'] }
+    { name: 'prefix', type: String, default: 'app', aliases: ['p'] },
+    { name: 'mobile', type: Boolean, default: false }
   ],
 
   anonymousOptions: ['<glob-pattern>'],
@@ -89,7 +90,8 @@ module.exports = Command.extend({
       targetFiles: rawArgs || '',
       rawArgs: rawArgs.toString(),
       sourceDir: commandOptions.sourceDir,
-      prefix: commandOptions.prefix
+      prefix: commandOptions.prefix,
+      mobile: commandOptions.mobile
     };
 
     if (!validProjectName(packageName)) {
diff --git a/addon/ng2/commands/new.ts b/addon/ng2/commands/new.ts
index ca30ef31896b..e5b226bb30cf 100644
--- a/addon/ng2/commands/new.ts
+++ b/addon/ng2/commands/new.ts
@@ -21,7 +21,8 @@ const NewCommand = Command.extend({
     { name: 'skip-git', type: Boolean, default: false, aliases: ['sg'] },
     { name: 'directory', type: String, aliases: ['dir'] },
     { name: 'source-dir', type: String, default: 'src', aliases: ['sd'] },
-    { name: 'prefix', type: String, default: 'app', aliases: ['p'] }
+    { name: 'prefix', type: String, default: 'app', aliases: ['p'] },
+    { name: 'mobile', type: Boolean, default: false }
   ],
 
   run: function (commandOptions, rawArgs) {
diff --git a/tests/acceptance/init.spec.js b/tests/acceptance/init.spec.js
index 89105f53fc9f..d39154375376 100644
--- a/tests/acceptance/init.spec.js
+++ b/tests/acceptance/init.spec.js
@@ -13,6 +13,7 @@ var conf = require('ember-cli/tests/helpers/conf');
 var minimatch = require('minimatch');
 var intersect = require('lodash/intersection');
 var remove = require('lodash/remove');
+var pull = require('lodash/pull');
 var forEach = require('lodash/forEach');
 var any = require('lodash/some');
 var EOL = require('os').EOL;
@@ -31,7 +32,12 @@ describe('Acceptance: ng init', function () {
   });
 
   beforeEach(function () {
-    Blueprint.ignoredFiles = defaultIgnoredFiles;
+    // Make a copy of defaultIgnoredFiles.
+    Blueprint.ignoredFiles = defaultIgnoredFiles.splice(0);
+
+    // Add the mobile ones.
+    Blueprint.ignoredFiles.push('manifest.webapp');
+    Blueprint.ignoredFiles.push('icon.png');
 
     return tmp.setup('./tmp').then(function () {
       process.chdir('./tmp');
@@ -103,6 +109,18 @@ describe('Acceptance: ng init', function () {
     ]).then(confirmBlueprinted);
   });
 
+  it('ng init --mobile', () => {
+    // Add the mobile ones.
+    pull(Blueprint.ignoredFiles, 'manifest.webapp');
+    pull(Blueprint.ignoredFiles, 'icon.png');
+    return ng([
+      'init',
+      '--skip-npm',
+      '--skip-bower',
+      '--mobile'
+    ]).then(confirmBlueprinted);
+  });
+
   it('ng init can run in created folder', function () {
     return tmp.setup('./tmp/foo')
       .then(function () {
@@ -183,5 +201,4 @@ describe('Acceptance: ng init', function () {
       })
       .then(confirmBlueprinted);
   });
-
 });
diff --git a/tests/acceptance/new.spec.js b/tests/acceptance/new.spec.js
index ef3b0f7d85d9..3f943de414dc 100644
--- a/tests/acceptance/new.spec.js
+++ b/tests/acceptance/new.spec.js
@@ -82,6 +82,15 @@ describe('Acceptance: ng new', function () {
     });
   });
 
+  it('ng new has a .editorconfig file', function () {
+    return ng(['new', 'FooApp', '--skip-npm', '--skip-bower', '--skip-git']).then(function () {
+      expect(!existsSync('FooApp'));
+
+      var editorConfig = fs.readFileSync('.editorconfig', 'utf8');
+      expect(editorConfig).to.exist;
+    });
+  });
+
   it('Cannot run ng new, inside of ember-cli project', function () {
     return ng(['new', 'foo', '--skip-npm', '--skip-bower', '--skip-git'])
       .then(function () {