Merged latest version of Ember App Kit