Update ember and ember-data

assets/javascripts/vendor/ember-data.js

@@ -1748,6 +1748,7 @@ DS.Store = Ember.Object.extend({
 
   loadMany: function(type, ids, hashes) {
     var clientIds = Ember.A([]);
+
     if (hashes === undefined) {
       hashes = ids;
       ids = [];
@@ -3155,7 +3156,7 @@ DS.Model = Ember.Object.extend(Ember.Evented, {
     also call methods with the given name.
   */
   trigger: function(name) {
-    this[name].apply(this, [].slice.call(arguments, 1));
+    Ember.tryInvoke(this, name, [].slice.call(arguments, 1));
     this._super.apply(this, arguments);
   }
 });
@@ -3671,8 +3672,8 @@ DS.Adapter = Ember.Object.extend({
 (function() {
 var set = Ember.set;
 
-Ember.onLoad('application', function(app) {
+Ember.onLoad('Ember.Application', function(Application) {
-  app.registerInjection({
+  Application.registerInjection({
     name: "store",
     before: "controllers",
 
@@ -3683,11 +3684,11 @@ Ember.onLoad('application', function(app) {
     }
   });
 
-  app.registerInjection({
+  Application.registerInjection({
     name: "giveStoreToControllers",
 
     injection: function(app, stateManager, property) {
-      if (property.match(/Controller$/)) {
+      if (/^[A-Z].*Controller$/.test(property)) {
         var controllerName = property.charAt(0).toLowerCase() + property.substr(1);
         var store = stateManager.get('store');
         var controller = stateManager.get(controllerName);