Ember bootstrap
Merge branch 'emberjs', remote-tracking branch 'origin'