Merge pull request #499 from teddyzeenny/fix-resolve-deprecation

Use the new resolveRegistration

ember_debug/data-debug.js

@@ -25,17 +25,18 @@ export default EmberObject.extend(PortMixin, {
   }),
 
   _resolve(name) {
-    const container = this.get('application').__container__;
+    // Ember >= 2.1
+    if (this.get('application').resolveRegistration) {
+      return this.get('application').resolveRegistration(name);
+    }
+    let container = this.get('application').__container__;
     let registry = this.get('application.registry');
     if (registry) {
       // Ember >= 1.11
       return registry.resolve(name);
     } else if (container.resolve) {
       // Ember < 1.11
       return container.resolve(name);
-    } else if (container.resolveRegistration) {
-      // Ember >= 2.1
-      return container.resolveRegistration(name);
     } else {
       // Ember >= 2.0 < 2.1
       return container.registry.resolve(name);