updated ember and ember-data. updated router and controllers based on changes in ember