Upgrade to Ember CLI 0.1.2
Merge branch 'master' into develop
Version 0.2
Merge branch 'develop'