[Ember.js] merging prototype

Contains all changes from #2303 with the exception of adding assets