Merged example Ember app from master branch