Upgrade ember-cli to 0.1.2
Resolve conflicts
Fix package.json
Merge pull request #315 from ember-admin/new-ember-cli

Upgrade ember-cli to 0.1.2