Merge pull request #275 from ember-admin/update-ember

Update ember
Merge branch 'pagination' of github.com:ember-admin/ember-admin.js into pagination
Merge branch 'pagination' of github.com:ember-admin/ember-admin.js into pagination
Pagination done