master: Updated Ember Templates and Generator