Updated ember-data and fixed loading