ember-source 1.12.0.beta.1 → 1.12.0.beta.3

data/dist/ember.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.12.0-beta.1
+ * @version   1.12.0-beta.3
  */
 
 (function() {
@@ -1100,21 +1100,9 @@ enifed('container', ['exports', 'container/registry', 'container/container'], fu
 
   'use strict';
 
-  /*
-  Public api for the container is still in flux.
-  The public api, specified on the application namespace should be considered the stable api.
-  // @module container
-    @private
-  */
-
-  /*
-   Flag to enable/disable model factory injections (disabled by default)
-   If model factory injections are enabled, models should not be
-   accessed globally (only through `container.lookupFactory('model:modelName'))`);
-  */
   Ember.MODEL_FACTORY_INJECTIONS = false;
 
-  if (Ember.ENV && typeof Ember.ENV.MODEL_FACTORY_INJECTIONS !== "undefined") {
+  if (Ember.ENV && typeof Ember.ENV.MODEL_FACTORY_INJECTIONS !== 'undefined') {
     Ember.MODEL_FACTORY_INJECTIONS = !!Ember.ENV.MODEL_FACTORY_INJECTIONS;
   }
 
@@ -1143,11 +1131,11 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/keys'
    */
   function Container(registry, options) {
     this._registry = registry || (function () {
-      Ember['default'].deprecate("A container should only be created for an already instantiated " + "registry. For backward compatibility, an isolated registry will " + "be instantiated just for this container.");
+      Ember['default'].deprecate('A container should only be created for an already instantiated ' + 'registry. For backward compatibility, an isolated registry will ' + 'be instantiated just for this container.');
 
       // TODO - See note above about transpiler import workaround.
       if (!Registry) {
-        Registry = requireModule("container/registry")["default"];
+        Registry = requireModule('container/registry')['default'];
       }
 
       return new Registry();
@@ -1216,7 +1204,7 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/keys'
      @return {any}
      */
     lookup: function (fullName, options) {
-      Ember['default'].assert("fullName must be a proper full name", this._registry.validateFullName(fullName));
+      Ember['default'].assert('fullName must be a proper full name', this._registry.validateFullName(fullName));
       return lookup(this, this._registry.normalize(fullName), options);
     },
 
@@ -1227,7 +1215,7 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/keys'
      @return {any}
      */
     lookupFactory: function (fullName) {
-      Ember['default'].assert("fullName must be a proper full name", this._registry.validateFullName(fullName));
+      Ember['default'].assert('fullName must be a proper full name', this._registry.validateFullName(fullName));
       return factoryFor(this, this._registry.normalize(fullName));
     },
 
@@ -1261,11 +1249,11 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/keys'
   };
 
   (function exposeRegistryMethods() {
-    var methods = ["register", "unregister", "resolve", "normalize", "typeInjection", "injection", "factoryInjection", "factoryTypeInjection", "has", "options", "optionsForType"];
+    var methods = ['register', 'unregister', 'resolve', 'normalize', 'typeInjection', 'injection', 'factoryInjection', 'factoryTypeInjection', 'has', 'options', 'optionsForType'];
 
     function exposeRegistryMethod(method) {
       Container.prototype[method] = function () {
-        Ember['default'].deprecate(method + " should be called on the registry instead of the container");
+        Ember['default'].deprecate(method + ' should be called on the registry instead of the container');
         return this._registry[method].apply(this._registry, arguments);
       };
     }
@@ -1288,7 +1276,7 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/keys'
       return;
     }
 
-    if (container._registry.getOption(fullName, "singleton") !== false && options.singleton !== false) {
+    if (container._registry.getOption(fullName, 'singleton') !== false && options.singleton !== false) {
       container.cache[fullName] = value;
     }
 
@@ -1331,9 +1319,9 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/keys'
       return;
     }
 
-    var type = fullName.split(":")[0];
-    if (!factory || typeof factory.extend !== "function" || !Ember['default'].MODEL_FACTORY_INJECTIONS && type === "model") {
-      if (factory && typeof factory._onLookup === "function") {
+    var type = fullName.split(':')[0];
+    if (!factory || typeof factory.extend !== 'function' || !Ember['default'].MODEL_FACTORY_INJECTIONS && type === 'model') {
+      if (factory && typeof factory._onLookup === 'function') {
         factory._onLookup(fullName);
       }
 
@@ -1350,7 +1338,7 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/keys'
       var injectedFactory = factory.extend(injections);
       injectedFactory.reopenClass(factoryInjections);
 
-      if (factory && typeof factory._onLookup === "function") {
+      if (factory && typeof factory._onLookup === 'function') {
         factory._onLookup(fullName);
       }
 
@@ -1362,7 +1350,7 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/keys'
 
   function injectionsFor(container, fullName) {
     var registry = container._registry;
-    var splitName = fullName.split(":");
+    var splitName = fullName.split(':');
     var type = splitName[0];
 
     var injections = buildInjections(container, registry.getTypeInjections(type), registry.getInjections(fullName));
@@ -1374,7 +1362,7 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/keys'
 
   function factoryInjectionsFor(container, fullName) {
     var registry = container._registry;
-    var splitName = fullName.split(":");
+    var splitName = fullName.split(':');
     var type = splitName[0];
 
     var factoryInjections = buildInjections(container, registry.getFactoryTypeInjections(type), registry.getFactoryInjections(fullName));
@@ -1387,19 +1375,19 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/keys'
     var factory = factoryFor(container, fullName);
     var lazyInjections, validationCache;
 
-    if (container._registry.getOption(fullName, "instantiate") === false) {
+    if (container._registry.getOption(fullName, 'instantiate') === false) {
       return factory;
     }
 
     if (factory) {
-      if (typeof factory.create !== "function") {
-        throw new Error("Failed to create an instance of '" + fullName + "'. " + "Most likely an improperly defined class or an invalid module export.");
+      if (typeof factory.create !== 'function') {
+        throw new Error('Failed to create an instance of \'' + fullName + '\'. ' + 'Most likely an improperly defined class or an invalid module export.');
       }
 
       validationCache = container.validationCache;
 
       // Ensure that all lazy injections are valid at instantiation time
-      if (!validationCache[fullName] && typeof factory._lazyInjections === "function") {
+      if (!validationCache[fullName] && typeof factory._lazyInjections === 'function') {
         lazyInjections = factory._lazyInjections();
         lazyInjections = container._registry.normalizeInjectionsHash(lazyInjections);
 
@@ -1408,7 +1396,7 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/keys'
 
       validationCache[fullName] = true;
 
-      if (typeof factory.extend === "function") {
+      if (typeof factory.extend === 'function') {
         // assume the factory was extendable and is already injected
         return factory.create();
       } else {
@@ -1429,7 +1417,7 @@ enifed('container/container', ['exports', 'ember-metal/core', 'ember-metal/keys'
       key = keys[i];
       value = cache[key];
 
-      if (container._registry.getOption(key, "instantiate") !== false) {
+      if (container._registry.getOption(key, 'instantiate') !== false) {
         callback(value);
       }
     }
@@ -1625,20 +1613,20 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
     },
 
     lookup: function (fullName, options) {
-      Ember['default'].assert("Create a container on the registry (with `registry.container()`) before calling `lookup`.", this._defaultContainer);
+      Ember['default'].assert('Create a container on the registry (with `registry.container()`) before calling `lookup`.', this._defaultContainer);
 
       if (instanceInitializersFeatureEnabled) {
-        Ember['default'].deprecate("`lookup` was called on a Registry. The `initializer` API no longer receives a container, and you should use an `instanceInitializer` to look up objects from the container.", { url: "http://emberjs.com/guides/deprecations#toc_deprecate-access-to-instances-in-initializers" });
+        Ember['default'].deprecate('`lookup` was called on a Registry. The `initializer` API no longer receives a container, and you should use an `instanceInitializer` to look up objects from the container.', false, { url: 'http://emberjs.com/guides/deprecations#toc_deprecate-access-to-instances-in-initializers' });
       }
 
       return this._defaultContainer.lookup(fullName, options);
     },
 
     lookupFactory: function (fullName) {
-      Ember['default'].assert("Create a container on the registry (with `registry.container()`) before calling `lookupFactory`.", this._defaultContainer);
+      Ember['default'].assert('Create a container on the registry (with `registry.container()`) before calling `lookupFactory`.', this._defaultContainer);
 
       if (instanceInitializersFeatureEnabled) {
-        Ember['default'].deprecate("`lookupFactory` was called on a Registry. The `initializer` API no longer receives a container, and you should use an `instanceInitializer` to look up objects from the container.", { url: "http://emberjs.com/guides/deprecations#toc_deprecate-access-to-instances-in-initializers" });
+        Ember['default'].deprecate('`lookupFactory` was called on a Registry. The `initializer` API no longer receives a container, and you should use an `instanceInitializer` to look up objects from the container.', false, { url: 'http://emberjs.com/guides/deprecations#toc_deprecate-access-to-instances-in-initializers' });
       }
 
       return this._defaultContainer.lookupFactory(fullName);
@@ -1659,16 +1647,16 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
      @param {Object} options
      */
     register: function (fullName, factory, options) {
-      Ember['default'].assert("fullName must be a proper full name", this.validateFullName(fullName));
+      Ember['default'].assert('fullName must be a proper full name', this.validateFullName(fullName));
 
       if (factory === undefined) {
-        throw new TypeError("Attempting to register an unknown factory: `" + fullName + "`");
+        throw new TypeError('Attempting to register an unknown factory: `' + fullName + '`');
       }
 
       var normalizedName = this.normalize(fullName);
 
       if (this._resolveCache[normalizedName]) {
-        throw new Error("Cannot re-register: `" + fullName + "`, as it has already been resolved.");
+        throw new Error('Cannot re-register: `' + fullName + '`, as it has already been resolved.');
       }
 
       this.registrations[normalizedName] = factory;
@@ -1688,7 +1676,7 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
      @param {String} fullName
      */
     unregister: function (fullName) {
-      Ember['default'].assert("fullName must be a proper full name", this.validateFullName(fullName));
+      Ember['default'].assert('fullName must be a proper full name', this.validateFullName(fullName));
 
       var normalizedName = this.normalize(fullName);
 
@@ -1723,7 +1711,7 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
      @return {Function} fullName's factory
      */
     resolve: function (fullName) {
-      Ember['default'].assert("fullName must be a proper full name", this.validateFullName(fullName));
+      Ember['default'].assert('fullName must be a proper full name', this.validateFullName(fullName));
       var factory = resolve(this, this.normalize(fullName));
       if (factory === undefined && this.fallback) {
         factory = this.fallback.resolve(fullName);
@@ -1783,7 +1771,7 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
      @return {Boolean}
      */
     has: function (fullName) {
-      Ember['default'].assert("fullName must be a proper full name", this.validateFullName(fullName));
+      Ember['default'].assert('fullName must be a proper full name', this.validateFullName(fullName));
       return has(this, this.normalize(fullName));
     },
 
@@ -1846,7 +1834,7 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
         return options[optionName];
       }
 
-      var type = fullName.split(":")[0];
+      var type = fullName.split(':')[0];
       options = this._typeOptions[type];
 
       if (options && options[optionName] !== undefined) {
@@ -1857,7 +1845,7 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
     },
 
     option: function (fullName, optionName) {
-      Ember['default'].deprecate("`Registry.option()` has been deprecated. Call `Registry.getOption()` instead.");
+      Ember['default'].deprecate('`Registry.option()` has been deprecated. Call `Registry.getOption()` instead.');
       return this.getOption(fullName, optionName);
     },
 
@@ -1889,11 +1877,11 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
      @param {String} fullName
      */
     typeInjection: function (type, property, fullName) {
-      Ember['default'].assert("fullName must be a proper full name", this.validateFullName(fullName));
+      Ember['default'].assert('fullName must be a proper full name', this.validateFullName(fullName));
 
-      var fullNameType = fullName.split(":")[0];
+      var fullNameType = fullName.split(':')[0];
       if (fullNameType === type) {
-        throw new Error("Cannot inject a `" + fullName + "` on other " + type + "(s).");
+        throw new Error('Cannot inject a `' + fullName + '` on other ' + type + '(s).');
       }
 
       var injections = this._typeInjections[type] || (this._typeInjections[type] = []);
@@ -1940,11 +1928,11 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
       this.validateFullName(injectionName);
       var normalizedInjectionName = this.normalize(injectionName);
 
-      if (fullName.indexOf(":") === -1) {
+      if (fullName.indexOf(':') === -1) {
         return this.typeInjection(fullName, property, normalizedInjectionName);
       }
 
-      Ember['default'].assert("fullName must be a proper full name", this.validateFullName(fullName));
+      Ember['default'].assert('fullName must be a proper full name', this.validateFullName(fullName));
       var normalizedName = this.normalize(fullName);
 
       var injections = this._injections[normalizedName] || (this._injections[normalizedName] = []);
@@ -2027,7 +2015,7 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
 
       this.validateFullName(injectionName);
 
-      if (fullName.indexOf(":") === -1) {
+      if (fullName.indexOf(':') === -1) {
         return this.factoryTypeInjection(normalizedName, property, normalizedInjectionName);
       }
 
@@ -2041,7 +2029,7 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
 
     validateFullName: function (fullName) {
       if (!VALID_FULL_NAME_REGEXP.test(fullName)) {
-        throw new TypeError("Invalid Fullname, expected: `type:name` got: " + fullName);
+        throw new TypeError('Invalid Fullname, expected: `type:name` got: ' + fullName);
       }
       return true;
     },
@@ -2057,7 +2045,7 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
         fullName = injections[i].fullName;
 
         if (!this.has(fullName)) {
-          throw new Error("Attempting to inject an unknown injection: `" + fullName + "`");
+          throw new Error('Attempting to inject an unknown injection: `' + fullName + '`');
         }
       }
     },
@@ -2067,7 +2055,7 @@ enifed('container/registry', ['exports', 'ember-metal/core', 'ember-metal/dictio
 
       for (var key in hash) {
         if (hash.hasOwnProperty(key)) {
-          Ember['default'].assert("Expected a proper full name, given '" + hash[key] + "'", this.validateFullName(hash[key]));
+          Ember['default'].assert('Expected a proper full name, given \'' + hash[key] + '\'', this.validateFullName(hash[key]));
 
           injections.push({
             property: key,
@@ -3207,7 +3195,7 @@ enifed('ember-application', ['ember-metal/core', 'ember-runtime/system/lazy_load
 	Ember['default'].Resolver = DefaultResolver.Resolver;
 	Ember['default'].DefaultResolver = DefaultResolver['default'];
 
-	lazy_load.runLoadHooks("Ember.Application", Application['default']);
+	lazy_load.runLoadHooks('Ember.Application', Application['default']);
 
 });
 enifed('ember-application/ext/controller', ['exports', 'ember-metal/core', 'ember-metal/property_get', 'ember-metal/error', 'ember-metal/utils', 'ember-metal/computed', 'ember-runtime/mixins/controller', 'ember-routing/system/controller_for'], function (exports, Ember, property_get, EmberError, utils, computed, ControllerMixin, controllerFor) {
@@ -3715,7 +3703,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       @type DOMElement
       @default 'body'
     */
-    rootElement: "body",
+    rootElement: 'body',
 
     /**
       The `Ember.EventDispatcher` responsible for delegating events to this
@@ -3809,8 +3797,8 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
     */
     buildInstance: function () {
       return ApplicationInstance['default'].create({
-        customEvents: property_get.get(this, "customEvents"),
-        rootElement: property_get.get(this, "rootElement"),
+        customEvents: property_get.get(this, 'customEvents'),
+        rootElement: property_get.get(this, 'rootElement'),
         applicationRegistry: this.registry
       });
     },
@@ -3820,7 +3808,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
 
       // For the default instance only, set the view registry to the global
       // Ember.View.views hash for backwards-compatibility.
-      EmberView['default'].views = instance.container.lookup("-view-registry:main");
+      EmberView['default'].views = instance.container.lookup('-view-registry:main');
 
       // TODO2.0: Legacy support for App.__container__
       // and global methods on App that rely on a single,
@@ -3846,9 +3834,9 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
     */
     waitForDOMReady: function (_instance) {
       if (!this.$ || this.$.isReady) {
-        run['default'].schedule("actions", this, "domReady", _instance);
+        run['default'].schedule('actions', this, 'domReady', _instance);
       } else {
-        this.$().ready(run['default'].bind(this, "domReady", _instance));
+        this.$().ready(run['default'].bind(this, 'domReady', _instance));
       }
     },
 
@@ -3858,7 +3846,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
        ```javascript
       var App = Ember.Application.create();
        App.deferReadiness();
-      // Ember.$ is a reference to the jQuery object/function
+       // Ember.$ is a reference to the jQuery object/function
       Ember.$.getJSON('/auth-token', function(token) {
         App.token = token;
         App.advanceReadiness();
@@ -3871,8 +3859,8 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
        @method deferReadiness
     */
     deferReadiness: function () {
-      Ember['default'].assert("You must call deferReadiness on an instance of Ember.Application", this instanceof Application);
-      Ember['default'].assert("You cannot defer readiness since the `ready()` hook has already been called.", this._readinessDeferrals > 0);
+      Ember['default'].assert('You must call deferReadiness on an instance of Ember.Application', this instanceof Application);
+      Ember['default'].assert('You cannot defer readiness since the `ready()` hook has already been called.', this._readinessDeferrals > 0);
       this._readinessDeferrals++;
     },
 
@@ -3884,7 +3872,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       @see {Ember.Application#deferReadiness}
     */
     advanceReadiness: function () {
-      Ember['default'].assert("You must call advanceReadiness on an instance of Ember.Application", this instanceof Application);
+      Ember['default'].assert('You must call advanceReadiness on an instance of Ember.Application', this instanceof Application);
       this._readinessDeferrals--;
 
       if (this._readinessDeferrals === 0) {
@@ -3922,9 +3910,9 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
        Some examples modifying that default behavior:
        ```javascript
       var App = Ember.Application.create();
-       App.Person  = Ember.Object.extend();
-      App.Orange  = Ember.Object.extend();
-      App.Email   = Ember.Object.extend();
+       App.Person = Ember.Object.extend();
+      App.Orange = Ember.Object.extend();
+      App.Email = Ember.Object.extend();
       App.session = Ember.Object.create();
        App.register('model:user', App.Person, { singleton: false });
       App.register('fruit:favorite', App.Orange);
@@ -3981,9 +3969,9 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       @param  injectionName {String}
     **/
     inject: function () {
-      var _registry;
+      var _registry2;
 
-      (_registry = this.registry).injection.apply(_registry, arguments);
+      (_registry2 = this.registry).injection.apply(_registry2, arguments);
     },
 
     /**
@@ -3995,7 +3983,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       @method initialize
      **/
     initialize: function () {
-      Ember['default'].deprecate("Calling initialize manually is not supported. Please see Ember.Application#advanceReadiness and Ember.Application#deferReadiness");
+      Ember['default'].deprecate('Calling initialize manually is not supported. Please see Ember.Application#advanceReadiness and Ember.Application#deferReadiness');
     },
 
     /**
@@ -4030,7 +4018,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       this._bootResolver = defer;
 
       this.runInitializers(this.registry);
-      lazy_load.runLoadHooks("application", this);
+      lazy_load.runLoadHooks('application', this);
 
       this.advanceReadiness();
 
@@ -4097,11 +4085,11 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       this._bootResolver = null;
 
       function handleReset() {
-        run['default'](instance, "destroy");
+        run['default'](instance, 'destroy');
 
         this.buildDefaultInstance();
 
-        run['default'].schedule("actions", this, "domReady");
+        run['default'].schedule('actions', this, 'domReady');
       }
 
       run['default'].join(this, handleReset);
@@ -4113,8 +4101,8 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
     */
     runInitializers: function (registry) {
       var App = this;
-      this._runInitializer("initializers", function (name, initializer) {
-        Ember['default'].assert("No application initializer named '" + name + "'", !!initializer);
+      this._runInitializer('initializers', function (name, initializer) {
+        Ember['default'].assert('No application initializer named \'' + name + '\'', !!initializer);
 
         
           initializer.initialize(registry, App);
@@ -4122,8 +4110,8 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
     },
 
     runInstanceInitializers: function (instance) {
-      this._runInitializer("instanceInitializers", function (name, initializer) {
-        Ember['default'].assert("No instance initializer named '" + name + "'", !!initializer);
+      this._runInitializer('instanceInitializers', function (name, initializer) {
+        Ember['default'].assert('No instance initializer named \'' + name + '\'', !!initializer);
         initializer.initialize(instance);
       });
     },
@@ -4193,6 +4181,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
 
     // This method must be moved to the application instance object
     willDestroy: function () {
+      this._super.apply(this, arguments);
       Ember['default'].BOOTED = false;
       this._bootPromise = null;
       this._bootResolver = null;
@@ -4209,7 +4198,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       @deprecated
     */
     then: function () {
-      Ember['default'].deprecate("Do not use `.then` on an instance of Ember.Application.  Please use the `.ready` hook instead.", false, { url: "http://emberjs.com/guides/deprecations/#toc_deprecate-code-then-code-on-ember-application" });
+      Ember['default'].deprecate('Do not use `.then` on an instance of Ember.Application.  Please use the `.ready` hook instead.', false, { url: 'http://emberjs.com/guides/deprecations/#toc_deprecate-code-then-code-on-ember-application' });
 
       this._super.apply(this, arguments);
     }
@@ -4223,7 +4212,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
     });
 
     Application.reopenClass({
-      instanceInitializer: buildInitializerMethod("instanceInitializers", "instance initializer")
+      instanceInitializer: buildInitializerMethod('instanceInitializers', 'instance initializer')
     });
   
 
@@ -4326,7 +4315,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
        @method initializer
       @param initializer {Object}
      */
-    initializer: buildInitializerMethod("initializers", "initializer"),
+    initializer: buildInitializerMethod('initializers', 'initializer'),
 
     /**
       This creates a registry with the default Ember naming conventions.
@@ -4359,62 +4348,62 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       registry.describe = registry.resolver.describe;
       registry.makeToString = registry.resolver.makeToString;
 
-      registry.optionsForType("component", { singleton: false });
-      registry.optionsForType("view", { singleton: false });
-      registry.optionsForType("template", { instantiate: false });
-      registry.optionsForType("helper", { instantiate: false });
+      registry.optionsForType('component', { singleton: false });
+      registry.optionsForType('view', { singleton: false });
+      registry.optionsForType('template', { instantiate: false });
+      registry.optionsForType('helper', { instantiate: false });
 
-      registry.register("application:main", namespace, { instantiate: false });
+      registry.register('application:main', namespace, { instantiate: false });
 
-      registry.register("controller:basic", Controller['default'], { instantiate: false });
-      registry.register("controller:object", ObjectController['default'], { instantiate: false });
-      registry.register("controller:array", ArrayController['default'], { instantiate: false });
+      registry.register('controller:basic', Controller['default'], { instantiate: false });
+      registry.register('controller:object', ObjectController['default'], { instantiate: false });
+      registry.register('controller:array', ArrayController['default'], { instantiate: false });
 
-      registry.register("renderer:-dom", { create: function () {
+      registry.register('renderer:-dom', { create: function () {
           return new Renderer['default'](new DOMHelper['default']());
         } });
 
-      registry.injection("view", "renderer", "renderer:-dom");
-      registry.register("view:select", SelectView['default']);
-      registry.register("view:-outlet", outlet.OutletView);
+      registry.injection('view', 'renderer', 'renderer:-dom');
+      registry.register('view:select', SelectView['default']);
+      registry.register('view:-outlet', outlet.OutletView);
 
-      registry.register("-view-registry:main", { create: function () {
+      registry.register('-view-registry:main', { create: function () {
           return {};
         } });
 
-      registry.injection("view", "_viewRegistry", "-view-registry:main");
+      registry.injection('view', '_viewRegistry', '-view-registry:main');
 
-      registry.register("view:default", _MetamorphView['default']);
-      registry.register("view:toplevel", EmberView['default'].extend());
+      registry.register('view:default', _MetamorphView['default']);
+      registry.register('view:toplevel', EmberView['default'].extend());
 
-      registry.register("route:basic", Route['default'], { instantiate: false });
-      registry.register("event_dispatcher:main", EventDispatcher['default']);
+      registry.register('route:basic', Route['default'], { instantiate: false });
+      registry.register('event_dispatcher:main', EventDispatcher['default']);
 
-      registry.injection("router:main", "namespace", "application:main");
-      registry.injection("view:-outlet", "namespace", "application:main");
+      registry.injection('router:main', 'namespace', 'application:main');
+      registry.injection('view:-outlet', 'namespace', 'application:main');
 
-      registry.register("location:auto", AutoLocation['default']);
-      registry.register("location:hash", HashLocation['default']);
-      registry.register("location:history", HistoryLocation['default']);
-      registry.register("location:none", NoneLocation['default']);
+      registry.register('location:auto', AutoLocation['default']);
+      registry.register('location:hash', HashLocation['default']);
+      registry.register('location:history', HistoryLocation['default']);
+      registry.register('location:none', NoneLocation['default']);
 
-      registry.injection("controller", "target", "router:main");
-      registry.injection("controller", "namespace", "application:main");
+      registry.injection('controller', 'target', 'router:main');
+      registry.injection('controller', 'namespace', 'application:main');
 
-      registry.register("-bucket-cache:main", BucketCache['default']);
-      registry.injection("router", "_bucketCache", "-bucket-cache:main");
-      registry.injection("route", "_bucketCache", "-bucket-cache:main");
-      registry.injection("controller", "_bucketCache", "-bucket-cache:main");
+      registry.register('-bucket-cache:main', BucketCache['default']);
+      registry.injection('router', '_bucketCache', '-bucket-cache:main');
+      registry.injection('route', '_bucketCache', '-bucket-cache:main');
+      registry.injection('controller', '_bucketCache', '-bucket-cache:main');
 
-      registry.injection("route", "router", "router:main");
+      registry.injection('route', 'router', 'router:main');
 
       // DEBUGGING
-      registry.register("resolver-for-debugging:main", registry.resolver.__resolver__, { instantiate: false });
-      registry.injection("container-debug-adapter:main", "resolver", "resolver-for-debugging:main");
-      registry.injection("data-adapter:main", "containerDebugAdapter", "container-debug-adapter:main");
+      registry.register('resolver-for-debugging:main', registry.resolver.__resolver__, { instantiate: false });
+      registry.injection('container-debug-adapter:main', 'resolver', 'resolver-for-debugging:main');
+      registry.injection('data-adapter:main', 'containerDebugAdapter', 'container-debug-adapter:main');
       // Custom resolver authors may want to register their own ContainerDebugAdapter with this key
 
-      registry.register("container-debug-adapter:main", ContainerDebugAdapter['default']);
+      registry.register('container-debug-adapter:main', ContainerDebugAdapter['default']);
 
       return registry;
     }
@@ -4437,9 +4426,9 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
     @return {*} the resolved value for a given lookup
   */
   function resolverFor(namespace) {
-    Ember['default'].deprecate("Application.resolver is deprecated in favor of Application.Resolver", !namespace.get("resolver"));
+    Ember['default'].deprecate('Application.resolver is deprecated in favor of Application.Resolver', !namespace.get('resolver'));
 
-    var ResolverClass = namespace.get("resolver") || namespace.get("Resolver") || DefaultResolver['default'];
+    var ResolverClass = namespace.get('resolver') || namespace.get('Resolver') || DefaultResolver['default'];
     var resolver = ResolverClass.create({
       namespace: namespace
     });
@@ -4460,7 +4449,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       if (resolver.normalize) {
         return resolver.normalize(fullName);
       } else {
-        Ember['default'].deprecate("The Resolver should now provide a 'normalize' function");
+        Ember['default'].deprecate('The Resolver should now provide a \'normalize\' function');
         return fullName;
       }
     };
@@ -4475,7 +4464,7 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       librariesRegistered = true;
 
       if (environment['default'].hasDOM) {
-        Ember['default'].libraries.registerCoreLibrary("jQuery", jQuery['default']().jquery);
+        Ember['default'].libraries.registerCoreLibrary('jQuery', jQuery['default']().jquery);
       }
     }
   }
@@ -4487,18 +4476,18 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
       var libs = Ember['default'].libraries._registry;
 
       var nameLengths = EnumerableUtils['default'].map(libs, function (item) {
-        return property_get.get(item, "name.length");
+        return property_get.get(item, 'name.length');
       });
 
       var maxNameLength = Math.max.apply(this, nameLengths);
 
-      Ember['default'].debug("-------------------------------");
+      Ember['default'].debug('-------------------------------');
       for (var i = 0, l = libs.length; i < l; i++) {
         var lib = libs[i];
-        var spaces = new Array(maxNameLength - lib.name.length + 1).join(" ");
-        Ember['default'].debug([lib.name, spaces, " : ", lib.version].join(""));
+        var spaces = new Array(maxNameLength - lib.name.length + 1).join(' ');
+        Ember['default'].debug([lib.name, spaces, ' : ', lib.version].join(''));
       }
-      Ember['default'].debug("-------------------------------");
+      Ember['default'].debug('-------------------------------');
     }
   }
 
@@ -4514,9 +4503,9 @@ enifed('ember-application/system/application', ['exports', 'dag-map', 'container
         this.reopenClass(attrs);
       }
 
-      Ember['default'].assert("The " + humanName + " '" + initializer.name + "' has already been registered", !this[bucketName][initializer.name]);
-      Ember['default'].assert("An " + humanName + " cannot be registered without an initialize function", utils.canInvoke(initializer, "initialize"));
-      Ember['default'].assert("An " + humanName + " cannot be registered without a name property", initializer.name !== undefined);
+      Ember['default'].assert('The ' + humanName + ' \'' + initializer.name + '\' has already been registered', !this[bucketName][initializer.name]);
+      Ember['default'].assert('An ' + humanName + ' cannot be registered without an initialize function', utils.canInvoke(initializer, 'initialize'));
+      Ember['default'].assert('An ' + humanName + ' cannot be registered without a name property', initializer.name !== undefined);
 
       this[bucketName][initializer.name] = initializer;
     };
@@ -4529,8 +4518,6 @@ enifed('ember-application/system/resolver', ['exports', 'ember-metal/core', 'emb
 
   'use strict';
 
-  var _slicedToArray = function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { var _arr = []; for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) { _arr.push(_step.value); if (i && _arr.length === i) break; } return _arr; } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } };
-
   /**
   @module ember
   @submodule ember-application
@@ -4550,9 +4537,7 @@ enifed('ember-application/system/resolver', ['exports', 'ember-metal/core', 'emb
     makeToString: null, // required
     resolveOther: null, // required
     _logLookup: null // required
-  });
-
-  exports['default'] = EmberObject['default'].extend({
+  });exports['default'] = EmberObject['default'].extend({
     /**
       This will be set to the Application instance when it is
       created.
@@ -4564,31 +4549,29 @@ enifed('ember-application/system/resolver', ['exports', 'ember-metal/core', 'emb
       this._parseNameCache = dictionary['default'](null);
     },
     normalize: function (fullName) {
-      var _fullName$split = fullName.split(":", 2);
+      var _fullName$split = fullName.split(':', 2);
 
-      var _fullName$split2 = _slicedToArray(_fullName$split, 2);
+      var type = _fullName$split[0];
+      var name = _fullName$split[1];
 
-      var type = _fullName$split2[0];
-      var name = _fullName$split2[1];
+      Ember['default'].assert('Tried to normalize a container name without a colon (:) in it.' + ' You probably tried to lookup a name that did not contain a type,' + ' a colon, and a name. A proper lookup name would be `view:post`.', fullName.split(':').length === 2);
 
-      Ember['default'].assert("Tried to normalize a container name without a colon (:) in it." + " You probably tried to lookup a name that did not contain a type," + " a colon, and a name. A proper lookup name would be `view:post`.", fullName.split(":").length === 2);
-
-      if (type !== "template") {
+      if (type !== 'template') {
         var result = name;
 
-        if (result.indexOf(".") > -1) {
+        if (result.indexOf('.') > -1) {
           result = result.replace(/\.(.)/g, function (m) {
             return m.charAt(1).toUpperCase();
           });
         }
 
-        if (name.indexOf("_") > -1) {
+        if (name.indexOf('_') > -1) {
           result = result.replace(/_(.)/g, function (m) {
             return m.charAt(1).toUpperCase();
           });
         }
 
-        return type + ":" + result;
+        return type + ':' + result;
       } else {
         return fullName;
       }
@@ -4634,30 +4617,28 @@ enifed('ember-application/system/resolver', ['exports', 'ember-metal/core', 'emb
     },
 
     _parseName: function (fullName) {
-      var _fullName$split = fullName.split(":");
-
-      var _fullName$split2 = _slicedToArray(_fullName$split, 2);
+      var _fullName$split2 = fullName.split(':');
 
       var type = _fullName$split2[0];
       var fullNameWithoutType = _fullName$split2[1];
 
       var name = fullNameWithoutType;
-      var namespace = property_get.get(this, "namespace");
+      var namespace = property_get.get(this, 'namespace');
       var root = namespace;
 
-      if (type !== "template" && name.indexOf("/") !== -1) {
-        var parts = name.split("/");
+      if (type !== 'template' && name.indexOf('/') !== -1) {
+        var parts = name.split('/');
         name = parts[parts.length - 1];
-        var namespaceName = string.capitalize(parts.slice(0, -1).join("."));
+        var namespaceName = string.capitalize(parts.slice(0, -1).join('.'));
         root = Namespace['default'].byName(namespaceName);
 
-        Ember['default'].assert("You are looking for a " + name + " " + type + " in the " + namespaceName + " namespace, but the namespace could not be found", root);
+        Ember['default'].assert('You are looking for a ' + name + ' ' + type + ' in the ' + namespaceName + ' namespace, but the namespace could not be found', root);
       }
 
-      var resolveMethodName = fullNameWithoutType === "main" ? "Main" : string.classify(type);
+      var resolveMethodName = fullNameWithoutType === 'main' ? 'Main' : string.classify(type);
 
       if (!(name && type)) {
-        throw new TypeError("Invalid fullName: `" + fullName + "`, must be of the form `type:name` ");
+        throw new TypeError('Invalid fullName: `' + fullName + '`, must be of the form `type:name` ');
       }
 
       return {
@@ -4666,7 +4647,7 @@ enifed('ember-application/system/resolver', ['exports', 'ember-metal/core', 'emb
         fullNameWithoutType: fullNameWithoutType,
         name: name,
         root: root,
-        resolveMethodName: "resolve" + resolveMethodName
+        resolveMethodName: 'resolve' + resolveMethodName
       };
     },
 
@@ -4683,13 +4664,13 @@ enifed('ember-application/system/resolver', ['exports', 'ember-metal/core', 'emb
       var parsedName = this.parseName(fullName);
       var description;
 
-      if (parsedName.type === "template") {
-        return "template at " + parsedName.fullNameWithoutType.replace(/\./g, "/");
+      if (parsedName.type === 'template') {
+        return 'template at ' + parsedName.fullNameWithoutType.replace(/\./g, '/');
       }
 
-      description = parsedName.root + "." + string.classify(parsedName.name).replace(/\./g, "");
+      description = parsedName.root + '.' + string.classify(parsedName.name).replace(/\./g, '');
 
-      if (parsedName.type !== "model") {
+      if (parsedName.type !== 'model') {
         description += string.classify(parsedName.type);
       }
 
@@ -4709,9 +4690,9 @@ enifed('ember-application/system/resolver', ['exports', 'ember-metal/core', 'emb
       @method useRouterNaming
     */
     useRouterNaming: function (parsedName) {
-      parsedName.name = parsedName.name.replace(/\./g, "_");
-      if (parsedName.name === "basic") {
-        parsedName.name = "";
+      parsedName.name = parsedName.name.replace(/\./g, '_');
+      if (parsedName.name === 'basic') {
+        parsedName.name = '';
       }
     },
     /**
@@ -4722,7 +4703,7 @@ enifed('ember-application/system/resolver', ['exports', 'ember-metal/core', 'emb
       @method resolveTemplate
     */
     resolveTemplate: function (parsedName) {
-      var templateName = parsedName.fullNameWithoutType.replace(/\./g, "/");
+      var templateName = parsedName.fullNameWithoutType.replace(/\./g, '/');
 
       if (Ember['default'].TEMPLATES[templateName]) {
         return Ember['default'].TEMPLATES[templateName];
@@ -4826,15 +4807,15 @@ enifed('ember-application/system/resolver', ['exports', 'ember-metal/core', 'emb
       var symbol, padding;
 
       if (found) {
-        symbol = "[✓]";
+        symbol = '[✓]';
       } else {
-        symbol = "[ ]";
+        symbol = '[ ]';
       }
 
       if (parsedName.fullName.length > 60) {
-        padding = ".";
+        padding = '.';
       } else {
-        padding = new Array(60 - parsedName.fullName.length).join(".");
+        padding = new Array(60 - parsedName.fullName.length).join('.');
       }
 
       Logger['default'].info(symbol, parsedName.fullName, padding, this.lookupDescription(parsedName.fullName));
@@ -4844,7 +4825,7 @@ enifed('ember-application/system/resolver', ['exports', 'ember-metal/core', 'emb
   exports.Resolver = Resolver;
 
 });
-enifed('ember-debug', ['exports', 'ember-metal/core', 'ember-metal/error', 'ember-metal/logger', 'ember-metal/environment'], function (exports, Ember, EmberError, Logger, environment) {
+enifed('ember-debug', ['exports', 'ember-metal/core', 'ember-metal/utils', 'ember-metal/error', 'ember-metal/logger', 'ember-metal/environment'], function (exports, Ember, utils, EmberError, Logger, environment) {
 
   'use strict';
 
@@ -4863,7 +4844,7 @@ enifed('ember-debug', ['exports', 'ember-metal/core', 'ember-metal/error', 'embe
   Ember['default'].assert = function (desc, test) {
     var throwAssertion;
 
-    if (Ember['default'].typeOf(test) === "function") {
+    if (utils.typeOf(test) === "function") {
       throwAssertion = !test();
     } else {
       throwAssertion = !test;
@@ -4914,8 +4895,9 @@ enifed('ember-debug', ['exports', 'ember-metal/core', 'ember-metal/error', 'embe
 
     @method deprecate
     @param {String} message A description of the deprecation.
-    @param {Boolean} test An optional boolean. If falsy, the deprecation
-      will be displayed.
+    @param {Boolean|Function} test An optional boolean. If falsy, the deprecation
+      will be displayed. If this is a function, it will be executed and its return
+      value will be used as condition.
     @param {Object} options An optional object that can be used to pass
       in a `url` to the transition guide on the emberjs.com website.
   */
@@ -5668,7 +5650,7 @@ enifed('ember-htmlbars/compat/handlebars-get', ['exports'], function (exports) {
   exports['default'] = handlebarsGet;
 
   function handlebarsGet(root, path, options) {
-    Ember.deprecate("Usage of Ember.Handlebars.get is deprecated, use a Component or Ember.Handlebars.makeBoundHelper instead.");
+    Ember.deprecate('Usage of Ember.Handlebars.get is deprecated, use a Component or Ember.Handlebars.makeBoundHelper instead.');
 
     return options.data.view.getStream(path).value();
   }
@@ -5703,7 +5685,7 @@ enifed('ember-htmlbars/compat/helper', ['exports', 'ember-metal/merge', 'ember-h
   function HandlebarsCompatibleHelper(fn) {
     this.helperFunction = function helperFunc(params, hash, options, env) {
       var param, blockResult, fnResult;
-      var context = this;
+      var context = env.data.view;
       var handlebarsOptions = {
         hash: {},
         types: new Array(params.length),
@@ -5719,6 +5701,12 @@ enifed('ember-htmlbars/compat/helper', ['exports', 'ember-metal/merge', 'ember-h
         handlebarsOptions.fn = function () {
           blockResult = options.template.render(context, env, options.morph.contextualElement);
         };
+
+        if (options.inverse) {
+          handlebarsOptions.inverse = function () {
+            blockResult = options.inverse.render(context, env, options.morph.contextualElement);
+          };
+        }
       }
 
       for (var prop in hash) {
@@ -6083,12 +6071,6 @@ enifed('ember-htmlbars/helpers', ['exports', 'ember-metal/platform/create', 'emb
     @param {Object|Function} helperFunc the helper function to add
   */
   var helpers = o_create['default'](null);
-
-  /**
-  @module ember
-  @submodule ember-htmlbars
-  */
-
   function registerHelper(name, helperFunc) {
     var helper;
 
@@ -6571,14 +6553,14 @@ enifed('ember-htmlbars/helpers/debugger', ['exports', 'ember-metal/logger'], fun
     var view = env.data.view;
 
     /* jshint unused: false */
-    var context = view.get("context");
+    var context = view.get('context');
 
     /* jshint unused: false */
     function get(path) {
       return view.getStream(path).value();
     }
 
-    Logger['default'].info("Use `view`, `context`, and `get(<path>)` to debug this template.");
+    Logger['default'].info('Use `view`, `context`, and `get(<path>)` to debug this template.');
 
     debugger;
   }
@@ -6599,7 +6581,7 @@ enifed('ember-htmlbars/helpers/each', ['exports', 'ember-metal/core', 'ember-vie
     var helperName = "each";
     var path = params[0] || view.getStream("");
 
-    Ember['default'].assert("If you pass more than one argument to the each helper, " + "it must be in the form #each foo in bar", params.length <= 1);
+    Ember['default'].assert("If you pass more than one argument to the each helper, " + "it must be in the form {{#each foo in bar}}", params.length <= 1);
 
     var blockParams = options.template && options.template.blockParams;
 
@@ -6608,7 +6590,7 @@ enifed('ember-htmlbars/helpers/each', ['exports', 'ember-metal/core', 'ember-vie
       hash.blockParams = blockParams;
     }
 
-    Ember['default'].deprecate("Using the context switching form of {{each}} is deprecated. " + "Please use the keyword form (`{{#each foo in bar}}`) instead.", hash.keyword === true || typeof hash.keyword === "string", { url: "http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope" });
+    Ember['default'].deprecate("Using the context switching form of {{each}} is deprecated. " + "Please use the block param form (`{{#each bar as |foo|}}`) instead.", hash.keyword === true || typeof hash.keyword === "string", { url: "http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope" });
 
     hash.dataSource = path;
     options.helperName = options.helperName || helperName;
@@ -6948,7 +6930,7 @@ enifed('ember-htmlbars/helpers/loc', ['exports', 'ember-metal/core', 'ember-runt
     @see {Ember.String#loc}
   */
   function locHelper(params, hash, options, env) {
-    Ember['default'].assert("You cannot pass bindings to `loc` helper", (function ifParamsContainBindings() {
+    Ember['default'].assert('You cannot pass bindings to `loc` helper', (function ifParamsContainBindings() {
       for (var i = 0, l = params.length; i < l; i++) {
         if (utils.isStream(params[i])) {
           return false;
@@ -7591,12 +7573,12 @@ enifed('ember-htmlbars/helpers/with', ['exports', 'ember-metal/core', 'ember-vie
 
     ```handlebars
     // posts might not be
-    {{#with user.posts as blogPosts}}
+    {{#with user.posts as |blogPosts|}}
       <div class="notice">
         There are {{blogPosts.length}} blog posts written by {{user.name}}.
       </div>
 
-      {{#each post in blogPosts}}
+      {{#each blogPosts as |post|}}
         <li>{{post.title}}</li>
       {{/each}}
     {{/with}}
@@ -7605,8 +7587,8 @@ enifed('ember-htmlbars/helpers/with', ['exports', 'ember-metal/core', 'ember-vie
     Without the `as` operator, it would be impossible to reference `user.name` in the example above.
 
     NOTE: The alias should not reuse a name from the bound property path.
-    For example: `{{#with foo.bar as foo}}` is not supported because it attempts to alias using
-    the first part of the property path, `foo`. Instead, use `{{#with foo.bar as baz}}`.
+    For example: `{{#with foo as |foo.bar|}}` is not supported because it attempts to alias using
+    the first part of the property path, `foo`. Instead, use `{{#with foo.bar as |baz|}}`.
 
     ### `controller` option
 
@@ -7616,7 +7598,7 @@ enifed('ember-htmlbars/helpers/with', ['exports', 'ember-metal/core', 'ember-vie
     This is very similar to using an `itemController` option with the `{{each}}` helper.
 
     ```handlebars
-    {{#with users.posts as posts controller='userBlogPosts'}}
+    {{#with users.posts controller='userBlogPosts' as |posts|}}
       {{!- `posts` is wrapped in our controller instance }}
     {{/with}}
     ```
@@ -7632,7 +7614,7 @@ enifed('ember-htmlbars/helpers/with', ['exports', 'ember-metal/core', 'ember-vie
     @return {String} HTML string
   */
   function withHelper(params, hash, options, env) {
-    Ember['default'].assert("{{#with foo}} must be called with a single argument or the use the " + "{{#with foo as bar}} syntax", params.length === 1);
+    Ember['default'].assert("{{#with}} must be called with an argument. For example, `{{#with foo as |bar|}}{{/with}}`", params.length === 1);
 
     Ember['default'].assert("The {{#with}} helper must be called with a block", !!options.template);
 
@@ -7642,7 +7624,7 @@ enifed('ember-htmlbars/helpers/with', ['exports', 'ember-metal/core', 'ember-vie
     if (options.template.blockParams) {
       preserveContext = true;
     } else {
-      Ember['default'].deprecate("Using the context switching form of `{{with}}` is deprecated. " + "Please use the keyword form (`{{with foo as bar}}`) instead.", false, { url: "http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope" });
+      Ember['default'].deprecate("Using the context switching form of `{{with}}` is deprecated. " + "Please use the block param form (`{{#with bar as |foo|}}`) instead.", false, { url: "http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope" });
       preserveContext = false;
     }
 
@@ -8490,7 +8472,7 @@ enifed('ember-htmlbars/system/render-view', ['exports', 'ember-metal/core', 'emb
   }
 
   function renderHTMLBarsTemplate(view, buffer, template) {
-    Ember['default'].assert("The template being rendered by `" + view + "` was compiled with `" + template.revision + "` which does not match `Ember@1.12.0-beta.1` (this revision).", template.revision === "Ember@1.12.0-beta.1");
+    Ember['default'].assert("The template being rendered by `" + view + "` was compiled with `" + template.revision + "` which does not match `Ember@1.12.0-beta.3` (this revision).", template.revision === "Ember@1.12.0-beta.3");
 
     var contextualElement = buffer.innerContextualElement();
     var args = view._blockArguments;
@@ -8529,7 +8511,7 @@ enifed('ember-htmlbars/templates/component', ['exports', 'ember-template-compile
   exports['default'] = template['default']((function () {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.12.0-beta.1",
+      revision: "Ember@1.12.0-beta.3",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -8577,7 +8559,7 @@ enifed('ember-htmlbars/templates/empty', ['exports', 'ember-template-compiler/sy
   exports['default'] = template['default']((function () {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.12.0-beta.1",
+      revision: "Ember@1.12.0-beta.3",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -8617,7 +8599,7 @@ enifed('ember-htmlbars/templates/link-to-escaped', ['exports', 'ember-template-c
   exports['default'] = template['default']((function () {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.12.0-beta.1",
+      revision: "Ember@1.12.0-beta.3",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -8665,7 +8647,7 @@ enifed('ember-htmlbars/templates/link-to-unescaped', ['exports', 'ember-template
   exports['default'] = template['default']((function () {
     return {
       isHTMLBars: true,
-      revision: "Ember@1.12.0-beta.1",
+      revision: "Ember@1.12.0-beta.3",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -8705,6 +8687,54 @@ enifed('ember-htmlbars/templates/link-to-unescaped', ['exports', 'ember-template
     };
   })());
 
+});
+enifed('ember-htmlbars/templates/select-option', ['exports', 'ember-template-compiler/system/template'], function (exports, template) {
+
+  'use strict';
+
+  exports['default'] = template['default']((function () {
+    return {
+      isHTMLBars: true,
+      revision: "Ember@1.12.0-beta.3",
+      blockParams: 0,
+      cachedFragment: null,
+      hasRendered: false,
+      build: function build(dom) {
+        var el0 = dom.createDocumentFragment();
+        var el1 = dom.createComment("");
+        dom.appendChild(el0, el1);
+        return el0;
+      },
+      render: function render(context, env, contextualElement) {
+        var dom = env.dom;
+        var hooks = env.hooks,
+            content = hooks.content;
+        dom.detectNamespace(contextualElement);
+        var fragment;
+        if (env.useFragmentCache && dom.canClone) {
+          if (this.cachedFragment === null) {
+            fragment = this.build(dom);
+            if (this.hasRendered) {
+              this.cachedFragment = fragment;
+            } else {
+              this.hasRendered = true;
+            }
+          }
+          if (this.cachedFragment) {
+            fragment = dom.cloneNode(this.cachedFragment, true);
+          }
+        } else {
+          fragment = this.build(dom);
+        }
+        var morph0 = dom.createMorphAt(fragment, 0, 0, contextualElement);
+        dom.insertBoundary(fragment, null);
+        dom.insertBoundary(fragment, 0);
+        content(env, morph0, context, "view.label");
+        return fragment;
+      }
+    };
+  })());
+
 });
 enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/system/template'], function (exports, template) {
 
@@ -8714,7 +8744,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
     var child0 = (function () {
       return {
         isHTMLBars: true,
-        revision: "Ember@1.12.0-beta.1",
+        revision: "Ember@1.12.0-beta.3",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -8758,7 +8788,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       var child0 = (function () {
         return {
           isHTMLBars: true,
-          revision: "Ember@1.12.0-beta.1",
+          revision: "Ember@1.12.0-beta.3",
           blockParams: 0,
           cachedFragment: null,
           hasRendered: false,
@@ -8800,7 +8830,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       })();
       return {
         isHTMLBars: true,
-        revision: "Ember@1.12.0-beta.1",
+        revision: "Ember@1.12.0-beta.3",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -8844,7 +8874,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       var child0 = (function () {
         return {
           isHTMLBars: true,
-          revision: "Ember@1.12.0-beta.1",
+          revision: "Ember@1.12.0-beta.3",
           blockParams: 0,
           cachedFragment: null,
           hasRendered: false,
@@ -8886,7 +8916,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
       })();
       return {
         isHTMLBars: true,
-        revision: "Ember@1.12.0-beta.1",
+        revision: "Ember@1.12.0-beta.3",
         blockParams: 0,
         cachedFragment: null,
         hasRendered: false,
@@ -8928,7 +8958,7 @@ enifed('ember-htmlbars/templates/select', ['exports', 'ember-template-compiler/s
     })();
     return {
       isHTMLBars: true,
-      revision: "Ember@1.12.0-beta.1",
+      revision: "Ember@1.12.0-beta.3",
       blockParams: 0,
       cachedFragment: null,
       hasRendered: false,
@@ -9199,8 +9229,8 @@ enifed('ember-metal-views/renderer', ['exports', 'dom-helper', 'ember-metal/envi
 
   Renderer.prototype.replaceIn = function Renderer_replaceIn(view, target) {
     var morph;
-    if (target.firstNode) {
-      morph = this._dom.createMorph(target, target.firstNode, target.lastNode);
+    if (target.firstChild) {
+      morph = this._dom.createMorph(target, target.firstChild, target.lastChild);
     } else {
       morph = this._dom.appendMorph(target);
     }
@@ -9237,7 +9267,7 @@ enifed('ember-metal-views/renderer', ['exports', 'dom-helper', 'ember-metal/envi
 
       this.beforeRemove(removeQueue[idx]);
 
-      childViews = view._childViews;
+      childViews = this.childViews(view);
       if (childViews) {
         for (i = 0, l = childViews.length; i < l; i++) {
           queue.push(childViews[i]);
@@ -9250,7 +9280,7 @@ enifed('ember-metal-views/renderer', ['exports', 'dom-helper', 'ember-metal/envi
 
       this.beforeRemove(destroyQueue[idx]);
 
-      childViews = view._childViews;
+      childViews = this.childViews(view);
       if (childViews) {
         for (i = 0, l = childViews.length; i < l; i++) {
           destroyQueue.push(childViews[i]);
@@ -9369,8 +9399,9 @@ enifed('ember-metal', ['exports', 'ember-metal/core', 'ember-metal/merge', 'embe
   computed.computed.and = computed_macros.and;
   computed.computed.or = computed_macros.or;
   computed.computed.any = computed_macros.any;
-  computed.computed.collect = computed_macros.collect;
+  computed.computed.collect = computed_macros.collect; // END IMPORTS
 
+  // BEGIN EXPORTS
   var EmberInstrumentation = Ember['default'].Instrumentation = {};
   EmberInstrumentation.instrument = instrumentation.instrument;
   EmberInstrumentation.subscribe = instrumentation.subscribe;
@@ -10791,7 +10822,7 @@ enifed('ember-metal/computed', ['exports', 'ember-metal/property_set', 'ember-me
         this._getter = config;
         if (config.__ember_arity > 1) {
           Ember.deprecate("Using the same function as getter and setter is deprecated.", false, {
-            url: "http://emberjs.com/deprecations/v1.x/#toc_deprecate-using-the-same-function-as-getter-and-setter-in-computed-properties"
+            url: "http://emberjs.com/deprecations/v1.x/#toc_computed-properties-with-a-shared-getter-and-setter"
           });
           this._setter = config;
         }
@@ -10884,6 +10915,8 @@ enifed('ember-metal/computed', ['exports', 'ember-metal/property_set', 'ember-me
   ComputedPropertyPrototype.readOnly = function (readOnly) {
     Ember.deprecate("Passing arguments to ComputedProperty.readOnly() is deprecated.", arguments.length === 0);
     this._readOnly = readOnly === undefined || !!readOnly; // Force to true once this deprecation is gone
+    Ember.assert("Computed properties that define a setter using the new syntax cannot be read-only", !(this._readOnly && this._setter && this._setter !== this._getter));
+
     return this;
   };
 
@@ -11582,10 +11615,10 @@ enifed('ember-metal/core', ['exports'], function (exports) {
 
     @class Ember
     @static
-    @version 1.12.0-beta.1
+    @version 1.12.0-beta.3
   */
 
-  if ("undefined" === typeof Ember) {
+  if ('undefined' === typeof Ember) {
     // Create core object. Make it act like an instance of Ember.Namespace so that
     // objects assigned to it are given a sane string representation.
     Ember = {};
@@ -11605,16 +11638,16 @@ enifed('ember-metal/core', ['exports'], function (exports) {
   Ember.isNamespace = true;
 
   Ember.toString = function () {
-    return "Ember";
+    return 'Ember';
   };
 
   /**
     @property VERSION
     @type String
-    @default '1.12.0-beta.1'
+    @default '1.12.0-beta.3'
     @static
   */
-  Ember.VERSION = "1.12.0-beta.1";
+  Ember.VERSION = '1.12.0-beta.3';
 
   /**
     Standard environmental variables. You can define these in a global `EmberENV`
@@ -11629,10 +11662,10 @@ enifed('ember-metal/core', ['exports'], function (exports) {
 
   if (Ember.ENV) {
     // do nothing if Ember.ENV is already setup
-    Ember.assert("Ember.ENV should be an object.", "object" !== typeof Ember.ENV);
-  } else if ("undefined" !== typeof EmberENV) {
+    Ember.assert('Ember.ENV should be an object.', 'object' !== typeof Ember.ENV);
+  } else if ('undefined' !== typeof EmberENV) {
     Ember.ENV = EmberENV;
-  } else if ("undefined" !== typeof ENV) {
+  } else if ('undefined' !== typeof ENV) {
     Ember.ENV = ENV;
   } else {
     Ember.ENV = {};
@@ -11641,7 +11674,7 @@ enifed('ember-metal/core', ['exports'], function (exports) {
   Ember.config = Ember.config || {};
 
   // We disable the RANGE API by default for performance reasons
-  if ("undefined" === typeof Ember.ENV.DISABLE_RANGE_API) {
+  if ('undefined' === typeof Ember.ENV.DISABLE_RANGE_API) {
     Ember.ENV.DISABLE_RANGE_API = true;
   }
 
@@ -11655,11 +11688,14 @@ enifed('ember-metal/core', ['exports'], function (exports) {
     @static
     @since 1.1.0
   */
+  Ember.FEATURES = {"features-stripped-test":false,"ember-routing-named-substates":true,"mandatory-setter":true,"ember-htmlbars-component-generation":false,"ember-htmlbars-component-helper":true,"ember-htmlbars-inline-if-helper":true,"ember-htmlbars-attribute-syntax":true,"ember-routing-transitioning-classes":true,"new-computed-syntax":true,"ember-testing-checkbox-helpers":false,"ember-metal-stream":false,"ember-application-instance-initializers":true,"ember-application-initializer-context":true,"ember-router-willtransition":true,"ember-application-visit":false,"ember-views-component-block-info":false,"ember-routing-core-outlet":false,"ember-libraries-isregistered":false}; //jshint ignore:line
 
-  Ember.FEATURES = Ember.ENV.FEATURES;
-
-  if (!Ember.FEATURES) {
-    Ember.FEATURES = {"features-stripped-test":false,"ember-routing-named-substates":true,"mandatory-setter":true,"ember-htmlbars-component-generation":false,"ember-htmlbars-component-helper":true,"ember-htmlbars-inline-if-helper":true,"ember-htmlbars-attribute-syntax":true,"ember-routing-transitioning-classes":true,"new-computed-syntax":true,"ember-testing-checkbox-helpers":false,"ember-metal-stream":false,"ember-htmlbars-each-with-index":true,"ember-application-instance-initializers":true,"ember-application-initializer-context":true,"ember-router-willtransition":true,"ember-application-visit":false,"ember-views-component-block-info":false,"ember-routing-core-outlet":false,"ember-libraries-isregistered":false}; //jshint ignore:line
+  if (Ember.ENV.FEATURES) {
+    for (var feature in Ember.ENV.FEATURES) {
+      if (Ember.ENV.FEATURES.hasOwnProperty(feature)) {
+        Ember.FEATURES[feature] = Ember.ENV.FEATURES[feature];
+      }
+    }
   }
 
   /**
@@ -11714,7 +11750,7 @@ enifed('ember-metal/core', ['exports'], function (exports) {
   */
   Ember.EXTEND_PROTOTYPES = Ember.ENV.EXTEND_PROTOTYPES;
 
-  if (typeof Ember.EXTEND_PROTOTYPES === "undefined") {
+  if (typeof Ember.EXTEND_PROTOTYPES === 'undefined') {
     Ember.EXTEND_PROTOTYPES = true;
   }
 
@@ -11760,22 +11796,22 @@ enifed('ember-metal/core', ['exports'], function (exports) {
 
   // Stub out the methods defined by the ember-debug package in case it's not loaded
 
-  if ("undefined" === typeof Ember.assert) {
+  if ('undefined' === typeof Ember.assert) {
     Ember.assert = K;
   }
-  if ("undefined" === typeof Ember.warn) {
+  if ('undefined' === typeof Ember.warn) {
     Ember.warn = K;
   }
-  if ("undefined" === typeof Ember.debug) {
+  if ('undefined' === typeof Ember.debug) {
     Ember.debug = K;
   }
-  if ("undefined" === typeof Ember.runInDebug) {
+  if ('undefined' === typeof Ember.runInDebug) {
     Ember.runInDebug = K;
   }
-  if ("undefined" === typeof Ember.deprecate) {
+  if ('undefined' === typeof Ember.deprecate) {
     Ember.deprecate = K;
   }
-  if ("undefined" === typeof Ember.deprecateFunc) {
+  if ('undefined' === typeof Ember.deprecateFunc) {
     Ember.deprecateFunc = function (_, func) {
       return func;
     };
@@ -11911,13 +11947,13 @@ enifed('ember-metal/dictionary', ['exports', 'ember-metal/platform/create'], fun
   exports['default'] = makeDictionary;
   function makeDictionary(parent) {
     var dict = create['default'](parent);
-    dict["_dict"] = null;
-    delete dict["_dict"];
+    dict['_dict'] = null;
+    delete dict['_dict'];
     return dict;
   }
 
 });
-enifed('ember-metal/enumerable_utils', ['exports', 'ember-metal/array'], function (exports, array) {
+enifed('ember-metal/enumerable_utils', ['exports', 'ember-metal/array'], function (exports, ember_metal__array) {
 
   'use strict';
 
@@ -11954,19 +11990,19 @@ enifed('ember-metal/enumerable_utils', ['exports', 'ember-metal/array'], functio
    */
   var splice = Array.prototype.splice;
   function map(obj, callback, thisArg) {
-    return obj.map ? obj.map(callback, thisArg) : array.map.call(obj, callback, thisArg);
+    return obj.map ? obj.map(callback, thisArg) : ember_metal__array.map.call(obj, callback, thisArg);
   }
 
   function forEach(obj, callback, thisArg) {
-    return obj.forEach ? obj.forEach(callback, thisArg) : array.forEach.call(obj, callback, thisArg);
+    return obj.forEach ? obj.forEach(callback, thisArg) : ember_metal__array.forEach.call(obj, callback, thisArg);
   }
 
   function filter(obj, callback, thisArg) {
-    return obj.filter ? obj.filter(callback, thisArg) : array.filter.call(obj, callback, thisArg);
+    return obj.filter ? obj.filter(callback, thisArg) : ember_metal__array.filter.call(obj, callback, thisArg);
   }
 
   function indexOf(obj, element, index) {
-    return obj.indexOf ? obj.indexOf(element, index) : array.indexOf.call(obj, element, index);
+    return obj.indexOf ? obj.indexOf(element, index) : ember_metal__array.indexOf.call(obj, element, index);
   }
 
   function indexesOf(obj, elements) {
@@ -12060,7 +12096,7 @@ enifed('ember-metal/environment', ['exports', 'ember-metal/core'], function (exp
   // by searching for window and document.createElement. An environment
   // with DOM may disable the DOM functionality of Ember explicitly by
   // defining a `disableBrowserEnvironment` ENV.
-  var hasDOM = typeof window !== "undefined" && typeof document !== "undefined" && typeof document.createElement !== "undefined" && !Ember['default'].ENV.disableBrowserEnvironment;
+  var hasDOM = typeof window !== 'undefined' && typeof document !== 'undefined' && typeof document.createElement !== 'undefined' && !Ember['default'].ENV.disableBrowserEnvironment;
 
   if (hasDOM) {
     environment = {
@@ -12077,7 +12113,7 @@ enifed('ember-metal/environment', ['exports', 'ember-metal/core'], function (exp
       isChrome: false,
       location: null,
       history: null,
-      userAgent: "Lynx (textmode)",
+      userAgent: 'Lynx (textmode)',
       global: null
     };
   }
@@ -12089,7 +12125,7 @@ enifed('ember-metal/error', ['exports', 'ember-metal/platform/create'], function
 
   'use strict';
 
-  var errorProps = ["description", "fileName", "lineNumber", "message", "name", "number", "stack"];
+  var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
 
   /**
     A subclass of the JavaScript Error object for use in Ember.
@@ -12488,7 +12524,7 @@ enifed('ember-metal/expand_properties', ['exports', 'ember-metal/error', 'ember-
     Ember.expandProperties('foo.bar', echo);              //=> 'foo.bar'
     Ember.expandProperties('{foo,bar}', echo);            //=> 'foo', 'bar'
     Ember.expandProperties('foo.{bar,baz}', echo);        //=> 'foo.bar', 'foo.baz'
-    Ember.expandProperties('{foo,bar}.baz', echo);        //=> '{foo,bar}.baz'
+    Ember.expandProperties('{foo,bar}.baz', echo);        //=> 'foo.baz', 'bar.baz'
     Ember.expandProperties('foo.{bar,baz}.@each', echo)   //=> 'foo.bar.@each', 'foo.baz.@each'
     Ember.expandProperties('{foo,bar}.{spam,eggs}', echo) //=> 'foo.spam', 'foo.eggs', 'bar.spam', 'bar.eggs'
     Ember.expandProperties('{foo}.bar.{baz}')             //=> 'foo.bar.baz'
@@ -12504,22 +12540,22 @@ enifed('ember-metal/expand_properties', ['exports', 'ember-metal/error', 'ember-
 
   var SPLIT_REGEX = /\{|\}/;
   function expandProperties(pattern, callback) {
-    if (pattern.indexOf(" ") > -1) {
-      throw new EmberError['default']("Brace expanded properties cannot contain spaces, e.g. 'user.{firstName, lastName}' should be 'user.{firstName,lastName}'");
+    if (pattern.indexOf(' ') > -1) {
+      throw new EmberError['default']('Brace expanded properties cannot contain spaces, e.g. \'user.{firstName, lastName}\' should be \'user.{firstName,lastName}\'');
     }
 
-    if ("string" === utils.typeOf(pattern)) {
+    if ('string' === utils.typeOf(pattern)) {
       var parts = pattern.split(SPLIT_REGEX);
       var properties = [parts];
 
       enumerable_utils.forEach(parts, function (part, index) {
-        if (part.indexOf(",") >= 0) {
-          properties = duplicateAndReplace(properties, part.split(","), index);
+        if (part.indexOf(',') >= 0) {
+          properties = duplicateAndReplace(properties, part.split(','), index);
         }
       });
 
       enumerable_utils.forEach(properties, function (property) {
-        callback(property.join(""));
+        callback(property.join(''));
       });
     } else {
       callback(pattern);
@@ -12820,7 +12856,7 @@ enifed('ember-metal/is_blank', ['exports', 'ember-metal/is_empty'], function (ex
     */
   exports['default'] = isBlank;
   function isBlank(obj) {
-    return isEmpty['default'](obj) || typeof obj === "string" && obj.match(/\S/) === null;
+    return isEmpty['default'](obj) || typeof obj === 'string' && obj.match(/\S/) === null;
   }
 
 });
@@ -12834,26 +12870,26 @@ enifed('ember-metal/is_empty', ['exports', 'ember-metal/property_get', 'ember-me
       return none;
     }
 
-    if (typeof obj.size === "number") {
+    if (typeof obj.size === 'number') {
       return !obj.size;
     }
 
     var objectType = typeof obj;
 
-    if (objectType === "object") {
-      var size = property_get.get(obj, "size");
-      if (typeof size === "number") {
+    if (objectType === 'object') {
+      var size = property_get.get(obj, 'size');
+      if (typeof size === 'number') {
         return !size;
       }
     }
 
-    if (typeof obj.length === "number" && objectType !== "function") {
+    if (typeof obj.length === 'number' && objectType !== 'function') {
       return !obj.length;
     }
 
-    if (objectType === "object") {
-      var length = property_get.get(obj, "length");
-      if (typeof length === "number") {
+    if (objectType === 'object') {
+      var length = property_get.get(obj, 'length');
+      if (typeof length === 'number') {
         return !length;
       }
     }
@@ -12940,20 +12976,20 @@ enifed('ember-metal/keys', ['exports', 'ember-metal/platform/define_property'],
     // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys
     keys = (function () {
       var hasOwnProperty = Object.prototype.hasOwnProperty;
-      var hasDontEnumBug = !({ toString: null }).propertyIsEnumerable("toString");
-      var dontEnums = ["toString", "toLocaleString", "valueOf", "hasOwnProperty", "isPrototypeOf", "propertyIsEnumerable", "constructor"];
+      var hasDontEnumBug = !({ toString: null }).propertyIsEnumerable('toString');
+      var dontEnums = ['toString', 'toLocaleString', 'valueOf', 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable', 'constructor'];
       var dontEnumsLength = dontEnums.length;
 
       return function keys(obj) {
-        if (typeof obj !== "object" && (typeof obj !== "function" || obj === null)) {
-          throw new TypeError("Object.keys called on non-object");
+        if (typeof obj !== 'object' && (typeof obj !== 'function' || obj === null)) {
+          throw new TypeError('Object.keys called on non-object');
         }
 
         var result = [];
         var prop, i;
 
         for (prop in obj) {
-          if (prop !== "_super" && prop.lastIndexOf("__", 0) !== 0 && hasOwnProperty.call(obj, prop)) {
+          if (prop !== '_super' && prop.lastIndexOf('__', 0) !== 0 && hasOwnProperty.call(obj, prop)) {
             result.push(prop);
           }
         }
@@ -13710,7 +13746,7 @@ enifed('ember-metal/merge', ['exports', 'ember-metal/keys'], function (exports,
   */
   exports['default'] = merge;
   function merge(original, updates) {
-    if (!updates || typeof updates !== "object") {
+    if (!updates || typeof updates !== 'object') {
       return original;
     }
 
@@ -13727,7 +13763,7 @@ enifed('ember-metal/merge', ['exports', 'ember-metal/keys'], function (exports,
   }
 
 });
-enifed('ember-metal/mixin', ['exports', 'ember-metal/core', 'ember-metal/merge', 'ember-metal/array', 'ember-metal/platform/create', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-metal/utils', 'ember-metal/expand_properties', 'ember-metal/properties', 'ember-metal/computed', 'ember-metal/binding', 'ember-metal/observer', 'ember-metal/events', 'ember-metal/streams/utils'], function (exports, Ember, merge, array, o_create, property_get, property_set, utils, expandProperties, properties, computed, ember_metal__binding, ember_metal__observer, events, streams__utils) {
+enifed('ember-metal/mixin', ['exports', 'ember-metal/core', 'ember-metal/merge', 'ember-metal/array', 'ember-metal/platform/create', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-metal/utils', 'ember-metal/expand_properties', 'ember-metal/properties', 'ember-metal/computed', 'ember-metal/binding', 'ember-metal/observer', 'ember-metal/events', 'ember-metal/streams/utils'], function (exports, Ember, merge, array, o_create, property_get, property_set, utils, expandProperties, ember_metal__properties, computed, ember_metal__binding, ember_metal__observer, events, streams__utils) {
 
   
   exports.mixin = mixin;
@@ -13959,7 +13995,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/core', 'ember-metal/merge',
   }
 
   function addNormalizedProperty(base, key, value, meta, descs, values, concats, mergings) {
-    if (value instanceof properties.Descriptor) {
+    if (value instanceof ember_metal__properties.Descriptor) {
       if (value === REQUIRED && descs[key]) {
         return CONTINUE;
       }
@@ -14191,7 +14227,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/core', 'ember-metal/merge',
 
       replaceObserversAndListeners(obj, key, value);
       detectBinding(obj, key, value, m);
-      properties.defineProperty(obj, key, desc, value, m);
+      ember_metal__properties.defineProperty(obj, key, desc, value, m);
     }
 
     if (!partial) {
@@ -14307,8 +14343,8 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/core', 'ember-metal/merge',
     @param arguments*
   */
   Mixin.create = function () {
-    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+    for (var _len2 = arguments.length, args = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
     }
 
     // ES6TODO: this relies on a global state?
@@ -14407,8 +14443,8 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/core', 'ember-metal/merge',
   };
 
   MixinPrototype.without = function () {
-    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+    for (var _len3 = arguments.length, args = Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+      args[_key3] = arguments[_key3];
     }
 
     var ret = new Mixin([this]);
@@ -14472,7 +14508,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/core', 'ember-metal/merge',
     return ret;
   };
 
-  exports.REQUIRED = REQUIRED = new properties.Descriptor();
+  REQUIRED = new ember_metal__properties.Descriptor();
   REQUIRED.toString = function () {
     return "(Required Property)";
   };
@@ -14486,14 +14522,14 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/core', 'ember-metal/merge',
     this.methodName = methodName;
   }
 
-  Alias.prototype = new properties.Descriptor();
+  Alias.prototype = new ember_metal__properties.Descriptor();
   function aliasMethod(methodName) {
     return new Alias(methodName);
   }
 
   function observer() {
-    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+    for (var _len4 = arguments.length, args = Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+      args[_key4] = arguments[_key4];
     }
 
     var func = args.slice(-1)[0];
@@ -14535,8 +14571,8 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/core', 'ember-metal/merge',
   }
 
   function beforeObserver() {
-    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+    for (var _len5 = arguments.length, args = Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+      args[_key5] = arguments[_key5];
     }
 
     var func = args.slice(-1)[0];
@@ -14570,6 +14606,7 @@ enifed('ember-metal/mixin', ['exports', 'ember-metal/core', 'ember-metal/merge',
   }
 
   exports.IS_BINDING = IS_BINDING;
+  exports.REQUIRED = REQUIRED;
 
 });
 enifed('ember-metal/observer', ['exports', 'ember-metal/watching', 'ember-metal/array', 'ember-metal/events'], function (exports, watching, array, ember_metal__events) {
@@ -14725,7 +14762,7 @@ enifed('ember-metal/path_cache', ['exports', 'ember-metal/cache'], function (exp
 
   var IS_GLOBAL = /^[A-Z$]/;
   var IS_GLOBAL_PATH = /^[A-Z$].*[\.]/;
-  var HAS_THIS = "this.";
+  var HAS_THIS = 'this.';
 
   var isGlobalCache = new Cache['default'](1000, function (key) {
     return IS_GLOBAL.test(key);
@@ -14740,7 +14777,7 @@ enifed('ember-metal/path_cache', ['exports', 'ember-metal/cache'], function (exp
   });
 
   var firstDotIndexCache = new Cache['default'](1000, function (key) {
-    return key.indexOf(".");
+    return key.indexOf('.');
   });
 
   var firstKeyCache = new Cache['default'](1000, function (path) {
@@ -14799,7 +14836,7 @@ enifed('ember-metal/platform/create', ['exports', 'ember-metal/platform/define_p
   // Remove "use strict"; from transpiled module until
   // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
   //
-  "REMOVE_USE_STRICT: true";
+  'REMOVE_USE_STRICT: true';
 
   var create;
   // ES5 15.2.3.5
@@ -14808,13 +14845,13 @@ enifed('ember-metal/platform/create', ['exports', 'ember-metal/platform/define_p
     /* jshint scripturl:true, proto:true */
     // Contributed by Brandon Benvie, October, 2012
     var createEmpty;
-    var supportsProto = !({ "__proto__": null } instanceof Object);
+    var supportsProto = !({ '__proto__': null } instanceof Object);
     // the following produces false positives
     // in Opera Mini => not a reliable check
     // Object.prototype.__proto__ === null
-    if (supportsProto || typeof document === "undefined") {
+    if (supportsProto || typeof document === 'undefined') {
       createEmpty = function () {
-        return { "__proto__": null };
+        return { '__proto__': null };
       };
     } else {
       // In old IE __proto__ can't be used to manually set `null`, nor does
@@ -14823,11 +14860,11 @@ enifed('ember-metal/platform/create', ['exports', 'ember-metal/platform/define_p
       // object and *steal* its Object.prototype and strip it bare. This is
       // used as the prototype to create nullary objects.
       createEmpty = function () {
-        var iframe = document.createElement("iframe");
+        var iframe = document.createElement('iframe');
         var parent = document.body || document.documentElement;
-        iframe.style.display = "none";
+        iframe.style.display = 'none';
         parent.appendChild(iframe);
-        iframe.src = "javascript:";
+        iframe.src = 'javascript:';
         var empty = iframe.contentWindow.Object.prototype;
         parent.removeChild(iframe);
         iframe = null;
@@ -14857,13 +14894,13 @@ enifed('ember-metal/platform/create', ['exports', 'ember-metal/platform/define_p
       if (prototype === null) {
         object = createEmpty();
       } else {
-        if (typeof prototype !== "object" && typeof prototype !== "function") {
+        if (typeof prototype !== 'object' && typeof prototype !== 'function') {
           // In the native implementation `parent` can be `null`
           // OR *any* `instanceof Object`  (Object|Function|Array|RegExp|etc)
           // Use `typeof` tho, b/c in old IE, DOM elements are not `instanceof Object`
           // like they are in modern browsers. Using `Object.create` on DOM elements
           // is...err...probably inappropriate, but the native version allows for it.
-          throw new TypeError("Object prototype may only be an Object or null"); // same msg as Chrome
+          throw new TypeError('Object prototype may only be an Object or null'); // same msg as Chrome
         }
 
         Type.prototype = prototype;
@@ -14945,7 +14982,7 @@ enifed('ember-metal/platform/define_property', ['exports'], function (exports) {
     try {
       var a = 5;
       var obj = {};
-      defineProperty(obj, "a", {
+      defineProperty(obj, 'a', {
         configurable: true,
         enumerable: true,
         get: function () {
@@ -14965,14 +15002,14 @@ enifed('ember-metal/platform/define_property', ['exports'], function (exports) {
       }
 
       // check non-enumerability
-      defineProperty(obj, "a", {
+      defineProperty(obj, 'a', {
         configurable: true,
         enumerable: false,
         writable: true,
         value: true
       });
       for (var key in obj) {
-        if (key === "a") {
+        if (key === 'a') {
           return;
         }
       }
@@ -14985,7 +15022,7 @@ enifed('ember-metal/platform/define_property', ['exports'], function (exports) {
 
       // Detects a bug in Android <3 where redefining a property without a value changes the value
       // Object.defineProperty once accessors have already been set.
-      defineProperty(obj, "a", {
+      defineProperty(obj, 'a', {
         enumerable: false
       });
       if (obj.a !== true) {
@@ -15002,12 +15039,12 @@ enifed('ember-metal/platform/define_property', ['exports'], function (exports) {
 
   var hasES5CompliantDefineProperty = !!defineProperty;
 
-  if (hasES5CompliantDefineProperty && typeof document !== "undefined") {
+  if (hasES5CompliantDefineProperty && typeof document !== 'undefined') {
     // This is for Safari 5.0, which supports Object.defineProperty, but not
     // on DOM nodes.
     var canDefinePropertyOnDOM = (function () {
       try {
-        defineProperty(document.createElement("div"), "definePropertyOnDOM", {});
+        defineProperty(document.createElement('div'), 'definePropertyOnDOM', {});
         return true;
       } catch (e) {}
 
@@ -15018,10 +15055,10 @@ enifed('ember-metal/platform/define_property', ['exports'], function (exports) {
       defineProperty = function (obj, keyName, desc) {
         var isNode;
 
-        if (typeof Node === "object") {
+        if (typeof Node === 'object') {
           isNode = obj instanceof Node;
         } else {
-          isNode = typeof obj === "object" && typeof obj.nodeType === "number" && typeof obj.nodeName === "string";
+          isNode = typeof obj === 'object' && typeof obj.nodeType === 'number' && typeof obj.nodeName === 'string';
         }
 
         if (isNode) {
@@ -15753,8 +15790,6 @@ enifed('ember-metal/run_loop', ['exports', 'ember-metal/core', 'ember-metal/util
 
   'use strict';
 
-  var _toConsumableArray = function (arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i]; return arr2; } else { return Array.from(arr); } };
-
   function onBegin(current) {
     run.currentRunLoop = current;
   }
@@ -15764,17 +15799,17 @@ enifed('ember-metal/run_loop', ['exports', 'ember-metal/core', 'ember-metal/util
   }
 
   // ES6TODO: should Backburner become es6?
-  var backburner = new Backburner['default'](["sync", "actions", "destroy"], {
+  var backburner = new Backburner['default'](['sync', 'actions', 'destroy'], {
     GUID_KEY: utils.GUID_KEY,
     sync: {
       before: property_events.beginPropertyChanges,
       after: property_events.endPropertyChanges
     },
-    defaultQueue: "actions",
+    defaultQueue: 'actions',
     onBegin: onBegin,
     onEnd: onEnd,
     onErrorTarget: Ember['default'],
-    onErrorMethod: "onerror"
+    onErrorMethod: 'onerror'
   });
 
   // ..........................................................
@@ -15872,12 +15907,12 @@ enifed('ember-metal/run_loop', ['exports', 'ember-metal/core', 'ember-metal/util
 
     ```javascript
     App.RichTextEditorComponent = Ember.Component.extend({
-      initializeTinyMCE: function() {
+      initializeTinyMCE: Ember.on('didInsertElement', function() {
         tinymce.init({
           selector: '#' + this.$().prop('id'),
           setup: Ember.run.bind(this, this.setupEditor)
         });
-      }.on('didInsertElement'),
+      }),
 
       setupEditor: function(editor) {
         this.set('editor', editor);
@@ -15913,7 +15948,7 @@ enifed('ember-metal/run_loop', ['exports', 'ember-metal/core', 'ember-metal/util
         args[_key2] = arguments[_key2];
       }
 
-      return run.join.apply(run, _toConsumableArray(curried.concat(args)));
+      return run.join.apply(run, curried.concat(args));
     };
   };
 
@@ -16084,12 +16119,12 @@ enifed('ember-metal/run_loop', ['exports', 'ember-metal/core', 'ember-metal/util
     @return {Object} Timer information for use in cancelling, see `run.cancel`.
   */
   run.once = function () {
-    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+    for (var _len3 = arguments.length, args = Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+      args[_key3] = arguments[_key3];
     }
 
     checkAutoRun();
-    args.unshift("actions");
+    args.unshift('actions');
     return backburner.scheduleOnce.apply(backburner, args);
   };
 
@@ -16208,8 +16243,8 @@ enifed('ember-metal/run_loop', ['exports', 'ember-metal/core', 'ember-metal/util
     @return {Object} Timer information for use in cancelling, see `run.cancel`.
   */
   run.next = function () {
-    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+    for (var _len4 = arguments.length, args = Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+      args[_key4] = arguments[_key4];
     }
 
     args.push(1);
@@ -16385,7 +16420,7 @@ enifed('ember-metal/run_loop', ['exports', 'ember-metal/core', 'ember-metal/util
   // Make sure it's not an autorun during testing
   function checkAutoRun() {
     if (!run.currentRunLoop) {
-      Ember['default'].assert("You have turned on testing mode, which disabled the run-loop's autorun.\n                  You will need to wrap any code with asynchronous side-effects in a run", !Ember['default'].testing);
+      Ember['default'].assert('You have turned on testing mode, which disabled the run-loop\'s autorun.\n                  You will need to wrap any code with asynchronous side-effects in a run', !Ember['default'].testing);
     }
   }
 
@@ -16603,7 +16638,7 @@ enifed('ember-metal/streams/stream', ['exports', 'ember-metal/platform/create',
     }
   };
 
-  /**
+  /*
     @public
     @class Stream
     @namespace Ember.stream
@@ -16854,7 +16889,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
   exports.concat = concat;
   exports.chain = chain;
 
-  /**
+  /*
    Check whether an object is a stream or not
 
    @public
@@ -18604,7 +18639,7 @@ enifed('ember-routing-htmlbars/helpers/query-params', ['exports', 'ember-metal/c
   }
 
 });
-enifed('ember-routing-htmlbars/helpers/render', ['exports', 'ember-metal/core', 'ember-metal/error', 'ember-runtime/system/string', 'ember-routing/system/generate_controller', 'ember-metal/streams/utils', 'ember-htmlbars/system/merge-view-bindings', 'ember-htmlbars/system/append-templated-view', 'ember-metal/platform/create'], function (exports, Ember, EmberError, string, generateController, utils, mergeViewBindings, appendTemplatedView, create) {
+enifed('ember-routing-htmlbars/helpers/render', ['exports', 'ember-metal/core', 'ember-metal/property_get', 'ember-metal/error', 'ember-runtime/system/string', 'ember-routing/system/generate_controller', 'ember-metal/streams/utils', 'ember-htmlbars/system/merge-view-bindings', 'ember-htmlbars/system/append-templated-view', 'ember-metal/platform/create'], function (exports, Ember, property_get, EmberError, string, generateController, utils, mergeViewBindings, appendTemplatedView, create) {
 
   'use strict';
 
@@ -18715,6 +18750,9 @@ enifed('ember-routing-htmlbars/helpers/render', ['exports', 'ember-metal/core',
     view = container.lookup("view:" + name);
     if (!view) {
       view = container.lookup("view:default");
+    }
+    var viewHasTemplateSpecified = !!property_get.get(view, "template");
+    if (!viewHasTemplateSpecified) {
       template = template || container.lookup(templateName);
     }
 
@@ -18781,6 +18819,13 @@ enifed('ember-routing-htmlbars/helpers/render', ['exports', 'ember-metal/core',
     view._isOutlet = true;
     view._outletName = "__ember_orphans__";
     view._matchOutletName = name;
+    view._parentOutlet = function () {
+      var parent = this._parentView;
+      while (parent && !parent._isOutlet) {
+        parent = parent._parentView;
+      }
+      return parent;
+    };
     view.setOutletState = function (state) {
       var ownState;
       if (state && (ownState = state.outlets[this._matchOutletName])) {
@@ -19944,7 +19989,7 @@ enifed('ember-routing/ext/run_loop', ['ember-metal/run_loop'], function (run) {
 
 	'use strict';
 
-	run['default']._addQueue("routerTransitions", "actions");
+	run['default']._addQueue('routerTransitions', 'actions');
 
 });
 enifed('ember-routing/location/api', ['exports', 'ember-metal/core', 'ember-metal/environment', 'ember-routing/location/util'], function (exports, Ember, environment, util) {
@@ -20418,7 +20463,13 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
       @method initState
     */
     initState: function () {
-      property_set.set(this, "history", property_get.get(this, "history") || window.history);
+      var history = property_get.get(this, "history") || window.history;
+      property_set.set(this, "history", history);
+
+      if (history && "state" in history) {
+        this.supportsHistory = true;
+      }
+
       this.replaceState(this.formatURL(this.getURL()));
     },
 
@@ -20460,7 +20511,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
       @param path {String}
     */
     setURL: function (path) {
-      var state = this._historyState;
+      var state = this.getState();
       path = this.formatURL(path);
 
       if (!state || state.path !== path) {
@@ -20476,7 +20527,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
       @param path {String}
     */
     replaceURL: function (path) {
-      var state = this._historyState;
+      var state = this.getState();
       path = this.formatURL(path);
 
       if (!state || state.path !== path) {
@@ -20484,6 +20535,23 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
       }
     },
 
+    /**
+      Get the current `history.state`. Checks for if a polyfill is
+      required and if so fetches this._historyState. The state returned
+      from getState may be null if an iframe has changed a window's
+      history.
+       @private
+      @method getState
+      @return state {Object}
+    */
+    getState: function () {
+      if (this.supportsHistory) {
+        return property_get.get(this, "history").state;
+      }
+
+      return this._historyState;
+    },
+
     /**
      Pushes a new state.
       @private
@@ -20493,7 +20561,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
     pushState: function (path) {
       var state = { path: path };
 
-      property_get.get(this, "history").pushState(null, null, path);
+      property_get.get(this, "history").pushState(state, null, path);
 
       this._historyState = state;
 
@@ -20509,7 +20577,7 @@ enifed('ember-routing/location/history_location', ['exports', 'ember-metal/prope
     */
     replaceState: function (path) {
       var state = { path: path };
-      property_get.get(this, "history").replaceState(null, null, path);
+      property_get.get(this, "history").replaceState(state, null, path);
 
       this._historyState = state;
 
@@ -20673,8 +20741,8 @@ enifed('ember-routing/location/util', ['exports'], function (exports) {
   function getPath(location) {
     var pathname = location.pathname;
     // Various versions of IE/Opera don't always return a leading slash
-    if (pathname.charAt(0) !== "/") {
-      pathname = "/" + pathname;
+    if (pathname.charAt(0) !== '/') {
+      pathname = '/' + pathname;
     }
 
     return pathname;
@@ -20686,10 +20754,10 @@ enifed('ember-routing/location/util', ['exports'], function (exports) {
 
   function getHash(location) {
     var href = location.href;
-    var hashIndex = href.indexOf("#");
+    var hashIndex = href.indexOf('#');
 
     if (hashIndex === -1) {
-      return "";
+      return '';
     } else {
       return href.substr(hashIndex);
     }
@@ -20704,10 +20772,10 @@ enifed('ember-routing/location/util', ['exports'], function (exports) {
 
     // Older browsers, especially IE, don't have origin
     if (!origin) {
-      origin = location.protocol + "//" + location.hostname;
+      origin = location.protocol + '//' + location.hostname;
 
       if (location.port) {
-        origin += ":" + location.port;
+        origin += ':' + location.port;
       }
     }
 
@@ -20715,7 +20783,7 @@ enifed('ember-routing/location/util', ['exports'], function (exports) {
   }
 
   function supportsHashChange(documentMode, global) {
-    return "onhashchange" in global && (documentMode === undefined || documentMode > 7);
+    return 'onhashchange' in global && (documentMode === undefined || documentMode > 7);
   }
 
   function supportsHistory(userAgent, history) {
@@ -20726,11 +20794,11 @@ enifed('ember-routing/location/util', ['exports'], function (exports) {
 
     // We only want Android 2, stock browser, and not Chrome which identifies
     // itself as 'Mobile Safari' as well
-    if (userAgent.indexOf("Android 2") !== -1 && userAgent.indexOf("Mobile Safari") !== -1 && userAgent.indexOf("Chrome") === -1) {
+    if (userAgent.indexOf('Android 2') !== -1 && userAgent.indexOf('Mobile Safari') !== -1 && userAgent.indexOf('Chrome') === -1) {
       return false;
     }
 
-    return !!(history && "pushState" in history);
+    return !!(history && 'pushState' in history);
   }
 
   function replacePath(location, path) {
@@ -20792,7 +20860,7 @@ enifed('ember-routing/system/controller_for', ['exports'], function (exports) {
   exports['default'] = controllerFor;
 
   function controllerFor(container, controllerName, lookupOptions) {
-    return container.lookup("controller:" + controllerName, lookupOptions);
+    return container.lookup('controller:' + controllerName, lookupOptions);
   }
 
 });
@@ -23125,9 +23193,9 @@ enifed('ember-routing/system/router', ['exports', 'ember-metal/core', 'ember-met
     },
 
     generate: function () {
-      var _router;
+      var _router2;
 
-      var url = (_router = this.router).generate.apply(_router, arguments);
+      var url = (_router2 = this.router).generate.apply(_router2, arguments);
       return this.location.formatURL(url);
     },
 
@@ -23160,9 +23228,9 @@ enifed('ember-routing/system/router', ['exports', 'ember-metal/core', 'ember-met
     },
 
     send: function (name, context) {
-      var _router;
+      var _router3;
 
-      (_router = this.router).trigger.apply(_router, arguments);
+      (_router3 = this.router).trigger.apply(_router3, arguments);
     },
 
     /**
@@ -23985,8 +24053,8 @@ enifed('ember-routing/utils', ['exports', 'ember-metal/utils'], function (export
 
   function routeArgs(targetRouteName, models, queryParams) {
     var args = [];
-    if (utils.typeOf(targetRouteName) === "string") {
-      args.push("" + targetRouteName);
+    if (utils.typeOf(targetRouteName) === 'string') {
+      args.push('' + targetRouteName);
     }
     args.push.apply(args, models);
     args.push({ queryParams: queryParams });
@@ -24159,17 +24227,17 @@ enifed('ember-runtime/compare', ['exports', 'ember-metal/utils', 'ember-runtime/
   */
   exports['default'] = compare;
   var TYPE_ORDER = {
-    "undefined": 0,
-    "null": 1,
-    "boolean": 2,
-    "number": 3,
-    "string": 4,
-    "array": 5,
-    "object": 6,
-    "instance": 7,
-    "function": 8,
-    "class": 9,
-    "date": 10
+    'undefined': 0,
+    'null': 1,
+    'boolean': 2,
+    'number': 3,
+    'string': 4,
+    'array': 5,
+    'object': 6,
+    'instance': 7,
+    'function': 8,
+    'class': 9,
+    'date': 10
   };
 
   //
@@ -24188,11 +24256,11 @@ enifed('ember-runtime/compare', ['exports', 'ember-metal/utils', 'ember-runtime/
     var type2 = utils.typeOf(w);
 
     if (Comparable['default']) {
-      if (type1 === "instance" && Comparable['default'].detect(v) && v.constructor.compare) {
+      if (type1 === 'instance' && Comparable['default'].detect(v) && v.constructor.compare) {
         return v.constructor.compare(v, w);
       }
 
-      if (type2 === "instance" && Comparable['default'].detect(w) && w.constructor.compare) {
+      if (type2 === 'instance' && Comparable['default'].detect(w) && w.constructor.compare) {
         return w.constructor.compare(w, v) * -1;
       }
     }
@@ -24205,14 +24273,14 @@ enifed('ember-runtime/compare', ['exports', 'ember-metal/utils', 'ember-runtime/
 
     // types are equal - so we have to check values now
     switch (type1) {
-      case "boolean":
-      case "number":
+      case 'boolean':
+      case 'number':
         return spaceship(v, w);
 
-      case "string":
+      case 'string':
         return spaceship(v.localeCompare(w), 0);
 
-      case "array":
+      case 'array':
         var vLen = v.length;
         var wLen = w.length;
         var len = Math.min(vLen, wLen);
@@ -24228,13 +24296,13 @@ enifed('ember-runtime/compare', ['exports', 'ember-metal/utils', 'ember-runtime/
         // shorter array should be ordered first
         return spaceship(vLen, wLen);
 
-      case "instance":
+      case 'instance':
         if (Comparable['default'] && Comparable['default'].detect(v)) {
           return v.compare(v, w);
         }
         return 0;
 
-      case "date":
+      case 'date':
         return spaceship(v.getTime(), w.getTime());
 
       default:
@@ -24415,8 +24483,8 @@ enifed('ember-runtime/computed/array_computed', ['exports', 'ember-metal/core',
       options = a_slice.call(arguments, -1)[0];
     }
 
-    if (typeof options !== "object") {
-      throw new EmberError['default']("Array Computed Property declared without an options hash");
+    if (typeof options !== 'object') {
+      throw new EmberError['default']('Array Computed Property declared without an options hash');
     }
 
     var cp = new ArrayComputedProperty(options);
@@ -24632,7 +24700,7 @@ enifed('ember-runtime/computed/reduce_computed', ['exports', 'ember-metal/core',
   var arrayBracketPattern = /\.\[\]$/;
 
   function get(obj, key) {
-    if (key === "@this") {
+    if (key === '@this') {
       return obj;
     }
 
@@ -24681,7 +24749,7 @@ enifed('ember-runtime/computed/reduce_computed', ['exports', 'ember-metal/core',
   }
 
   function ItemPropertyObserverContext(dependentArray, index, trackedArray) {
-    Ember['default'].assert("Internal error: trackedArray is null or undefined", trackedArray);
+    Ember['default'].assert('Internal error: trackedArray is null or undefined', trackedArray);
 
     this.dependentArray = dependentArray;
     this.index = index;
@@ -24705,8 +24773,8 @@ enifed('ember-runtime/computed/reduce_computed', ['exports', 'ember-metal/core',
       this.dependentKeysByGuid[utils.guidFor(dependentArray)] = dependentKey;
 
       dependentArray.addArrayObserver(this, {
-        willChange: "dependentArrayWillChange",
-        didChange: "dependentArrayDidChange"
+        willChange: 'dependentArrayWillChange',
+        didChange: 'dependentArrayDidChange'
       });
 
       if (this.cp._itemPropertyKeys[dependentKey]) {
@@ -24722,8 +24790,8 @@ enifed('ember-runtime/computed/reduce_computed', ['exports', 'ember-metal/core',
       this.teardownPropertyObservers(dependentKey, itemPropertyKeys);
 
       dependentArray.removeArrayObserver(this, {
-        willChange: "dependentArrayWillChange",
-        didChange: "dependentArrayDidChange"
+        willChange: 'dependentArrayWillChange',
+        didChange: 'dependentArrayDidChange'
       });
     },
 
@@ -24736,7 +24804,7 @@ enifed('ember-runtime/computed/reduce_computed', ['exports', 'ember-metal/core',
 
     setupPropertyObservers: function (dependentKey, itemPropertyKeys) {
       var dependentArray = get(this.instanceMeta.context, dependentKey);
-      var length = get(dependentArray, "length");
+      var length = get(dependentArray, 'length');
       var observerContexts = new Array(length);
 
       this.resetTransformations(dependentKey, observerContexts);
@@ -24823,7 +24891,7 @@ enifed('ember-runtime/computed/reduce_computed', ['exports', 'ember-metal/core',
     },
 
     updateIndexes: function (trackedArray, array) {
-      var length = get(array, "length");
+      var length = get(array, 'length');
       // OPTIMIZE: we could stop updating once we hit the object whose observer
       // fired; ie partially apply the transformations
       trackedArray.apply(function (observerContexts, offset, operation, operationIndex) {
@@ -24854,7 +24922,7 @@ enifed('ember-runtime/computed/reduce_computed', ['exports', 'ember-metal/core',
       var guid = utils.guidFor(dependentArray);
       var dependentKey = this.dependentKeysByGuid[guid];
       var itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey] || [];
-      var length = get(dependentArray, "length");
+      var length = get(dependentArray, 'length');
       var normalizedIndex = normalizeIndex(index, length, 0);
       var normalizedRemoveCount = normalizeRemoveCount(normalizedIndex, length, removedCount);
       var item, itemIndex, sliceIndex, observerContexts;
@@ -24893,7 +24961,7 @@ enifed('ember-runtime/computed/reduce_computed', ['exports', 'ember-metal/core',
       var dependentKey = this.dependentKeysByGuid[guid];
       var observerContexts = new Array(addedCount);
       var itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey];
-      var length = get(dependentArray, "length");
+      var length = get(dependentArray, 'length');
       var normalizedIndex = normalizeIndex(index, length, addedCount);
       var endIndex = normalizedIndex + addedCount;
       var changeMeta, observerContext;
@@ -25107,7 +25175,7 @@ enifed('ember-runtime/computed/reduce_computed', ['exports', 'ember-metal/core',
 
       meta.dependentArraysObserver.suspendArrayObservers(function () {
         enumerable_utils.forEach(cp._dependentKeys, function (dependentKey) {
-          Ember['default'].assert("dependent array " + dependentKey + " must be an `Ember.Array`.  " + "If you are not extending arrays, you will need to wrap native arrays with `Ember.A`", !(utils.isArray(get(this, dependentKey)) && !EmberArray['default'].detect(get(this, dependentKey))));
+          Ember['default'].assert('dependent array ' + dependentKey + ' must be an `Ember.Array`.  ' + 'If you are not extending arrays, you will need to wrap native arrays with `Ember.A`', !(utils.isArray(get(this, dependentKey)) && !EmberArray['default'].detect(get(this, dependentKey))));
 
           if (!partiallyRecomputeFor(this, dependentKey)) {
             return;
@@ -25153,7 +25221,7 @@ enifed('ember-runtime/computed/reduce_computed', ['exports', 'ember-metal/core',
     };
 
     this._getter = function (propertyName) {
-      Ember['default'].assert("Computed reduce values require at least one dependent key", cp._dependentKeys);
+      Ember['default'].assert('Computed reduce values require at least one dependent key', cp._dependentKeys);
 
       recompute.call(this, propertyName);
 
@@ -25204,7 +25272,7 @@ enifed('ember-runtime/computed/reduce_computed', ['exports', 'ember-metal/core',
   };
 
   ReduceComputedProperty.prototype.initialValue = function () {
-    if (typeof this.options.initialValue === "function") {
+    if (typeof this.options.initialValue === 'function') {
       return this.options.initialValue();
     } else {
       return this.options.initialValue;
@@ -25235,7 +25303,7 @@ enifed('ember-runtime/computed/reduce_computed', ['exports', 'ember-metal/core',
 
     enumerable_utils.forEach(args, function (dependentKey) {
       if (doubleEachPropertyPattern.test(dependentKey)) {
-        throw new EmberError['default']("Nested @each properties not supported: " + dependentKey);
+        throw new EmberError['default']('Nested @each properties not supported: ' + dependentKey);
       } else if (match = eachPropertyPattern.exec(dependentKey)) {
         dependentArrayKey = match[1];
 
@@ -25266,12 +25334,12 @@ enifed('ember-runtime/computed/reduce_computed', ['exports', 'ember-metal/core',
       options = a_slice.call(arguments, -1)[0];
     }
 
-    if (typeof options !== "object") {
-      throw new EmberError['default']("Reduce Computed Property declared without an options hash");
+    if (typeof options !== 'object') {
+      throw new EmberError['default']('Reduce Computed Property declared without an options hash');
     }
 
-    if (!("initialValue" in options)) {
-      throw new EmberError['default']("Reduce Computed Property declared without an initial value");
+    if (!('initialValue' in options)) {
+      throw new EmberError['default']('Reduce Computed Property declared without an initial value');
     }
 
     var cp = new ReduceComputedProperty(options);
@@ -25378,7 +25446,7 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     var callback = function (item) {
       return property_get.get(item, propertyKey);
     };
-    return map(dependentKey + ".@each." + propertyKey, callback);
+    return map(dependentKey + '.@each.' + propertyKey, callback);
   }
 
   /**
@@ -25432,7 +25500,7 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
       };
     }
 
-    return filter(dependentKey + ".@each." + propertyKey, callback);
+    return filter(dependentKey + '.@each.' + propertyKey, callback);
   }
 
   /**
@@ -25546,7 +25614,7 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
 
   function setDiff(setAProperty, setBProperty) {
     if (arguments.length !== 2) {
-      throw new EmberError['default']("setDiff requires exactly two dependent arrays.");
+      throw new EmberError['default']('setDiff requires exactly two dependent arrays.');
     }
 
     return array_computed.arrayComputed(setAProperty, setBProperty, {
@@ -25586,7 +25654,7 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     var mid, midItem, res, guidMid, guidItem;
 
     if (arguments.length < 4) {
-      high = property_get.get(array, "length");
+      high = property_get.get(array, 'length');
     }
 
     if (arguments.length < 3) {
@@ -25622,9 +25690,9 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
     return mid;
   }
   function sort(itemsKey, sortDefinition) {
-    Ember['default'].assert("Ember.computed.sort requires two arguments: an array key to sort and " + "either a sort properties key or sort function", arguments.length === 2);
+    Ember['default'].assert('Ember.computed.sort requires two arguments: an array key to sort and ' + 'either a sort properties key or sort function', arguments.length === 2);
 
-    if (typeof sortDefinition === "function") {
+    if (typeof sortDefinition === 'function') {
       return customSort(itemsKey, sortDefinition);
     } else {
       return propertySort(itemsKey, sortDefinition);
@@ -25677,14 +25745,14 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
           var sortPropertyAscending = instanceMeta.sortPropertyAscending = {};
           var sortProperty, idx, asc;
 
-          Ember['default'].assert("Cannot sort: '" + sortPropertiesKey + "' is not an array.", utils.isArray(sortPropertyDefinitions));
+          Ember['default'].assert('Cannot sort: \'' + sortPropertiesKey + '\' is not an array.', utils.isArray(sortPropertyDefinitions));
 
           changeMeta.property.clearItemPropertyKeys(itemsKey);
 
           enumerable_utils.forEach(sortPropertyDefinitions, function (sortPropertyDefinition) {
-            if ((idx = sortPropertyDefinition.indexOf(":")) !== -1) {
+            if ((idx = sortPropertyDefinition.indexOf(':')) !== -1) {
               sortProperty = sortPropertyDefinition.substring(0, idx);
-              asc = sortPropertyDefinition.substring(idx + 1).toLowerCase() !== "desc";
+              asc = sortPropertyDefinition.substring(idx + 1).toLowerCase() !== 'desc';
             } else {
               sortProperty = sortPropertyDefinition;
               asc = true;
@@ -25695,7 +25763,7 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-metal
             changeMeta.property.itemPropertyKey(itemsKey, sortProperty);
           });
 
-          sortPropertyDefinitions.addObserver("@each", this, updateSortPropertiesOnce);
+          this.addObserver(sortPropertiesKey + '.@each', this, updateSortPropertiesOnce);
         }
 
         function updateSortPropertiesOnce() {
@@ -25823,12 +25891,12 @@ enifed('ember-runtime/controllers/array_controller', ['exports', 'ember-metal/co
       @return {String}
     */
     lookupItemController: function (object) {
-      return property_get.get(this, "itemController");
+      return property_get.get(this, 'itemController');
     },
 
     objectAtContent: function (idx) {
-      var length = property_get.get(this, "length");
-      var arrangedContent = property_get.get(this, "arrangedContent");
+      var length = property_get.get(this, 'length');
+      var arrangedContent = property_get.get(this, 'arrangedContent');
       var object = arrangedContent && arrangedContent.objectAt(idx);
       var controllerClass;
 
@@ -25885,7 +25953,7 @@ enifed('ember-runtime/controllers/array_controller', ['exports', 'ember-metal/co
         return Ember['default'].A();
       },
       set: function (key, value) {
-        Ember['default'].assert("ArrayController expects `model` to implement the Ember.Array mixin. " + "This can often be fixed by wrapping your model with `Ember.A()`.", EmberArray['default'].detect(value));
+        Ember['default'].assert('ArrayController expects `model` to implement the Ember.Array mixin. ' + 'This can often be fixed by wrapping your model with `Ember.A()`.', EmberArray['default'].detect(value) || !value);
 
         return value;
       }
@@ -25902,7 +25970,7 @@ enifed('ember-runtime/controllers/array_controller', ['exports', 'ember-metal/co
     _isVirtual: false,
 
     controllerAt: function (idx, object, controllerClass) {
-      var container = property_get.get(this, "container");
+      var container = property_get.get(this, 'container');
       var subControllers = this._subControllers;
       var fullName, subController, parentController;
 
@@ -25915,15 +25983,15 @@ enifed('ember-runtime/controllers/array_controller', ['exports', 'ember-metal/co
       }
 
       if (this._isVirtual) {
-        parentController = property_get.get(this, "parentController");
+        parentController = property_get.get(this, 'parentController');
       } else {
         parentController = this;
       }
 
-      fullName = "controller:" + controllerClass;
+      fullName = 'controller:' + controllerClass;
 
       if (!container._registry.has(fullName)) {
-        throw new EmberError['default']("Could not resolve itemController: \"" + controllerClass + "\"");
+        throw new EmberError['default']('Could not resolve itemController: "' + controllerClass + '"');
       }
 
       subController = container.lookupFactory(fullName).create({
@@ -25970,7 +26038,7 @@ enifed('ember-runtime/controllers/controller', ['exports', 'ember-metal/core', '
   var Controller = EmberObject['default'].extend(Mixin['default']);
 
   function controllerInjectionHelper(factory) {
-    Ember['default'].assert("Defining an injected controller property on a " + "non-controller is not allowed.", Mixin['default'].detect(factory.PrototypeMixin));
+    Ember['default'].assert('Defining an injected controller property on a ' + 'non-controller is not allowed.', Mixin['default'].detect(factory.PrototypeMixin));
   }
 
   /**
@@ -26003,7 +26071,7 @@ enifed('ember-runtime/controllers/controller', ['exports', 'ember-metal/core', '
            to the property's name
     @return {Ember.InjectedProperty} injection descriptor instance
     */
-  inject.createInjectionHelper("controller", controllerInjectionHelper);
+  inject.createInjectionHelper('controller', controllerInjectionHelper);
 
   exports['default'] = Controller;
 
@@ -26012,7 +26080,7 @@ enifed('ember-runtime/controllers/object_controller', ['exports', 'ember-metal/c
 
   'use strict';
 
-  var objectControllerDeprecation = "Ember.ObjectController is deprecated, " + "please use Ember.Controller and use `model.propertyName`.";
+  var objectControllerDeprecation = 'Ember.ObjectController is deprecated, ' + 'please use Ember.Controller and use `model.propertyName`.';
 
   exports['default'] = ObjectProxy['default'].extend(ControllerMixin['default'], {
     init: function () {
@@ -26050,7 +26118,7 @@ enifed('ember-runtime/copy', ['exports', 'ember-metal/enumerable_utils', 'ember-
     var ret, loc, key;
 
     // primitive data types are immutable, just return them.
-    if (typeof obj !== "object" || obj === null) {
+    if (typeof obj !== 'object' || obj === null) {
       return obj;
     }
 
@@ -26059,11 +26127,11 @@ enifed('ember-runtime/copy', ['exports', 'ember-metal/enumerable_utils', 'ember-
       return copies[loc];
     }
 
-    Ember.assert("Cannot clone an Ember.Object that does not implement Ember.Copyable", !(obj instanceof EmberObject['default']) || Copyable['default'] && Copyable['default'].detect(obj));
+    Ember.assert('Cannot clone an Ember.Object that does not implement Ember.Copyable', !(obj instanceof EmberObject['default']) || Copyable['default'] && Copyable['default'].detect(obj));
 
     // IMPORTANT: this specific test will detect a native array only. Any other
     // object will need to implement Copyable.
-    if (utils.typeOf(obj) === "array") {
+    if (utils.typeOf(obj) === 'array') {
       ret = obj.slice();
 
       if (deep) {
@@ -26088,7 +26156,7 @@ enifed('ember-runtime/copy', ['exports', 'ember-metal/enumerable_utils', 'ember-
 
         // Prevents browsers that don't respect non-enumerability from
         // copying internal Ember properties
-        if (key.substring(0, 2) === "__") {
+        if (key.substring(0, 2) === '__') {
           continue;
         }
 
@@ -26105,7 +26173,7 @@ enifed('ember-runtime/copy', ['exports', 'ember-metal/enumerable_utils', 'ember-
   }
   function copy(obj, deep) {
     // fast paths
-    if ("object" !== typeof obj || obj === null) {
+    if ('object' !== typeof obj || obj === null) {
       return obj; // can't copy primitives
     }
 
@@ -26147,7 +26215,7 @@ enifed('ember-runtime/core', ['exports'], function (exports) {
     @return {Boolean}
   */
   function isEqual(a, b) {
-    if (a && typeof a.isEqual === "function") {
+    if (a && typeof a.isEqual === 'function') {
       return a.isEqual(b);
     }
 
@@ -26275,9 +26343,9 @@ enifed('ember-runtime/ext/function', ['ember-metal/core', 'ember-metal/expand_pr
       @for Function
     */
     FunctionPrototype.observesImmediately = function () {
-      Ember['default'].assert("Immediate observers must observe internal properties only, " + "not properties on other objects.", function checkIsInternalProperty() {
+      Ember['default'].assert('Immediate observers must observe internal properties only, ' + 'not properties on other objects.', function checkIsInternalProperty() {
         for (var i = 0, l = arguments.length; i < l; i++) {
-          if (arguments[i].indexOf(".") !== -1) {
+          if (arguments[i].indexOf('.') !== -1) {
             return false;
           }
         }
@@ -26353,7 +26421,7 @@ enifed('ember-runtime/ext/rsvp', ['exports', 'ember-metal/core', 'ember-metal/lo
 
   exports.onerrorDefault = onerrorDefault;
 
-  var testModuleName = "ember-testing/test";
+  var testModuleName = 'ember-testing/test';
   var Test;
 
   var asyncStart = function () {
@@ -26368,14 +26436,14 @@ enifed('ember-runtime/ext/rsvp', ['exports', 'ember-metal/core', 'ember-metal/lo
     }
   };
 
-  RSVP.configure("async", function (callback, promise) {
+  RSVP.configure('async', function (callback, promise) {
     var async = !run['default'].currentRunLoop;
 
     if (Ember['default'].testing && async) {
       asyncStart();
     }
 
-    run['default'].backburner.schedule("actions", function () {
+    run['default'].backburner.schedule('actions', function () {
       if (Ember['default'].testing && async) {
         asyncEnd();
       }
@@ -26384,8 +26452,8 @@ enifed('ember-runtime/ext/rsvp', ['exports', 'ember-metal/core', 'ember-metal/lo
   });
 
   RSVP.Promise.prototype.fail = function (callback, label) {
-    Ember['default'].deprecate("RSVP.Promise.fail has been renamed as RSVP.Promise.catch");
-    return this["catch"](callback, label);
+    Ember['default'].deprecate('RSVP.Promise.fail has been renamed as RSVP.Promise.catch');
+    return this['catch'](callback, label);
   };
   function onerrorDefault(e) {
     var error;
@@ -26393,7 +26461,7 @@ enifed('ember-runtime/ext/rsvp', ['exports', 'ember-metal/core', 'ember-metal/lo
     if (e && e.errorThrown) {
       // jqXHR provides this
       error = e.errorThrown;
-      if (typeof error === "string") {
+      if (typeof error === 'string') {
         error = new Error(error);
       }
       error.__reason_with_error_thrown__ = e;
@@ -26401,11 +26469,11 @@ enifed('ember-runtime/ext/rsvp', ['exports', 'ember-metal/core', 'ember-metal/lo
       error = e;
     }
 
-    if (error && error.name !== "TransitionAborted") {
+    if (error && error.name !== 'TransitionAborted') {
       if (Ember['default'].testing) {
         // ES6TODO: remove when possible
         if (!Test && Ember['default'].__loader.registry[testModuleName]) {
-          Test = requireModule(testModuleName)["default"];
+          Test = requireModule(testModuleName)['default'];
         }
 
         if (Test && Test.adapter) {
@@ -26422,7 +26490,7 @@ enifed('ember-runtime/ext/rsvp', ['exports', 'ember-metal/core', 'ember-metal/lo
     }
   }
 
-  RSVP.on("error", onerrorDefault);
+  RSVP.on('error', onerrorDefault);
 
   exports['default'] = RSVP;
 
@@ -26872,19 +26940,19 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
   // HELPERS
   //
   function arrayObserversHelper(obj, target, opts, operation, notify) {
-    var willChange = opts && opts.willChange || "arrayWillChange";
-    var didChange = opts && opts.didChange || "arrayDidChange";
-    var hasObservers = property_get.get(obj, "hasArrayObservers");
+    var willChange = opts && opts.willChange || 'arrayWillChange';
+    var didChange = opts && opts.didChange || 'arrayDidChange';
+    var hasObservers = property_get.get(obj, 'hasArrayObservers');
 
     if (hasObservers === notify) {
-      property_events.propertyWillChange(obj, "hasArrayObservers");
+      property_events.propertyWillChange(obj, 'hasArrayObservers');
     }
 
-    operation(obj, "@array:before", target, willChange);
-    operation(obj, "@array:change", target, didChange);
+    operation(obj, '@array:before', target, willChange);
+    operation(obj, '@array:change', target, didChange);
 
     if (hasObservers === notify) {
-      property_events.propertyDidChange(obj, "hasArrayObservers");
+      property_events.propertyDidChange(obj, 'hasArrayObservers');
     }
 
     return obj;
@@ -26959,7 +27027,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
       @return {*} item at index or undefined
     */
     objectAt: function (idx) {
-      if (idx < 0 || idx >= property_get.get(this, "length")) {
+      if (idx < 0 || idx >= property_get.get(this, 'length')) {
         return undefined;
       }
 
@@ -26998,12 +27066,12 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
        @property []
       @return this
     */
-    "[]": computed.computed({
+    '[]': computed.computed({
       get: function (key) {
         return this;
       },
       set: function (key, value) {
-        this.replace(0, property_get.get(this, "length"), value);
+        this.replace(0, property_get.get(this, 'length'), value);
         return this;
       }
     }),
@@ -27013,7 +27081,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
     }),
 
     lastObject: computed.computed(function () {
-      return this.objectAt(property_get.get(this, "length") - 1);
+      return this.objectAt(property_get.get(this, 'length') - 1);
     }),
 
     // optimized version from Enumerable
@@ -27039,7 +27107,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
     */
     slice: function (beginIndex, endIndex) {
       var ret = Ember['default'].A();
-      var length = property_get.get(this, "length");
+      var length = property_get.get(this, 'length');
 
       if (isNone['default'](beginIndex)) {
         beginIndex = 0;
@@ -27084,7 +27152,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
       @return {Number} index or -1 if not found
     */
     indexOf: function (object, startAt) {
-      var len = property_get.get(this, "length");
+      var len = property_get.get(this, 'length');
       var idx;
 
       if (startAt === undefined) {
@@ -27124,7 +27192,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
       @return {Number} index or -1 if not found
     */
     lastIndexOf: function (object, startAt) {
-      var len = property_get.get(this, "length");
+      var len = property_get.get(this, 'length');
       var idx;
 
       if (startAt === undefined || startAt >= len) {
@@ -27193,7 +27261,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
        @property {Boolean} hasArrayObservers
     */
     hasArrayObservers: computed.computed(function () {
-      return events.hasListeners(this, "@array:change") || events.hasListeners(this, "@array:before");
+      return events.hasListeners(this, '@array:change') || events.hasListeners(this, '@array:before');
     }),
 
     /**
@@ -27227,13 +27295,13 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
       }
 
       // Make sure the @each proxy is set up if anyone is observing @each
-      if (watching.isWatching(this, "@each")) {
-        property_get.get(this, "@each");
+      if (watching.isWatching(this, '@each')) {
+        property_get.get(this, '@each');
       }
 
-      events.sendEvent(this, "@array:before", [this, startIdx, removeAmt, addAmt]);
+      events.sendEvent(this, '@array:before', [this, startIdx, removeAmt, addAmt]);
 
-      if (startIdx >= 0 && removeAmt >= 0 && property_get.get(this, "hasEnumerableObservers")) {
+      if (startIdx >= 0 && removeAmt >= 0 && property_get.get(this, 'hasEnumerableObservers')) {
         removing = [];
         lim = startIdx + removeAmt;
 
@@ -27279,7 +27347,7 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
         }
       }
 
-      if (startIdx >= 0 && addAmt >= 0 && property_get.get(this, "hasEnumerableObservers")) {
+      if (startIdx >= 0 && addAmt >= 0 && property_get.get(this, 'hasEnumerableObservers')) {
         adding = [];
         lim = startIdx + addAmt;
 
@@ -27291,20 +27359,20 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
       }
 
       this.enumerableContentDidChange(removeAmt, adding);
-      events.sendEvent(this, "@array:change", [this, startIdx, removeAmt, addAmt]);
+      events.sendEvent(this, '@array:change', [this, startIdx, removeAmt, addAmt]);
 
-      var length = property_get.get(this, "length");
-      var cachedFirst = computed.cacheFor(this, "firstObject");
-      var cachedLast = computed.cacheFor(this, "lastObject");
+      var length = property_get.get(this, 'length');
+      var cachedFirst = computed.cacheFor(this, 'firstObject');
+      var cachedLast = computed.cacheFor(this, 'lastObject');
 
       if (this.objectAt(0) !== cachedFirst) {
-        property_events.propertyWillChange(this, "firstObject");
-        property_events.propertyDidChange(this, "firstObject");
+        property_events.propertyWillChange(this, 'firstObject');
+        property_events.propertyDidChange(this, 'firstObject');
       }
 
       if (this.objectAt(length - 1) !== cachedLast) {
-        property_events.propertyWillChange(this, "lastObject");
-        property_events.propertyDidChange(this, "lastObject");
+        property_events.propertyWillChange(this, 'lastObject');
+        property_events.propertyDidChange(this, 'lastObject');
       }
 
       return this;
@@ -27323,10 +27391,10 @@ enifed('ember-runtime/mixins/array', ['exports', 'ember-metal/core', 'ember-meta
       use the `[]` property instead of `@each`.
        @property @each
     */
-    "@each": computed.computed(function () {
+    '@each': computed.computed(function () {
       if (!this.__each) {
         // ES6TODO: GRRRRR
-        var EachProxy = requireModule("ember-runtime/system/each_proxy")["EachProxy"];
+        var EachProxy = requireModule('ember-runtime/system/each_proxy')['EachProxy'];
 
         this.__each = new EachProxy(this);
       }
@@ -27429,9 +27497,9 @@ enifed('ember-runtime/mixins/controller_content_model_alias_deprecation', ['expo
 
       if (props.content && !modelSpecified) {
         props.model = props.content;
-        delete props["content"];
+        delete props['content'];
 
-        Ember['default'].deprecate("Do not specify `content` on a Controller, use `model` instead.");
+        Ember['default'].deprecate('Do not specify `content` on a Controller, use `model` instead.');
       }
     }
   });
@@ -27661,8 +27729,8 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
        @property firstObject
       @return {Object} the object or undefined
     */
-    firstObject: computed.computed("[]", function () {
-      if (property_get.get(this, "length") === 0) {
+    firstObject: computed.computed('[]', function () {
+      if (property_get.get(this, 'length') === 0) {
         return undefined;
       }
 
@@ -27688,8 +27756,8 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
        @property lastObject
       @return {Object} the last object or undefined
     */
-    lastObject: computed.computed("[]", function () {
-      var len = property_get.get(this, "length");
+    lastObject: computed.computed('[]', function () {
+      var len = property_get.get(this, 'length');
 
       if (len === 0) {
         return undefined;
@@ -27752,12 +27820,12 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @return {Object} receiver
     */
     forEach: function (callback, target) {
-      if (typeof callback !== "function") {
+      if (typeof callback !== 'function') {
         throw new TypeError();
       }
 
       var context = popCtx();
-      var len = property_get.get(this, "length");
+      var len = property_get.get(this, 'length');
       var last = null;
 
       if (target === undefined) {
@@ -27782,7 +27850,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @param {String} key name of the property
       @return {Array} The mapped array.
     */
-    getEach: mixin.aliasMethod("mapBy"),
+    getEach: mixin.aliasMethod('mapBy'),
 
     /**
       Sets the value on the named property for each member. This is more
@@ -27852,7 +27920,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @deprecated Use `mapBy` instead
     */
 
-    mapProperty: mixin.aliasMethod("mapBy"),
+    mapProperty: mixin.aliasMethod('mapBy'),
 
     /**
       Returns an array with all of the items in the enumeration that the passed
@@ -27937,7 +28005,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @return {Array} filtered array
       @deprecated Use `filterBy` instead
     */
-    filterProperty: mixin.aliasMethod("filterBy"),
+    filterProperty: mixin.aliasMethod('filterBy'),
 
     /**
       Returns an array with the items that do not have truthy values for
@@ -27972,7 +28040,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @return {Array} rejected array
       @deprecated Use `rejectBy` instead
     */
-    rejectProperty: mixin.aliasMethod("rejectBy"),
+    rejectProperty: mixin.aliasMethod('rejectBy'),
 
     /**
       Returns the first item in the array for which the callback returns true.
@@ -27997,7 +28065,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @return {Object} Found item or `undefined`.
     */
     find: function (callback, target) {
-      var len = property_get.get(this, "length");
+      var len = property_get.get(this, 'length');
 
       if (target === undefined) {
         target = null;
@@ -28049,7 +28117,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @return {Object} found item or `undefined`
       @deprecated Use `findBy` instead
     */
-    findProperty: mixin.aliasMethod("findBy"),
+    findProperty: mixin.aliasMethod('findBy'),
 
     /**
       Returns `true` if the passed function returns true for every item in the
@@ -28090,7 +28158,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @deprecated Use `isEvery` instead
       @return {Boolean}
     */
-    everyBy: mixin.aliasMethod("isEvery"),
+    everyBy: mixin.aliasMethod('isEvery'),
 
     /**
       @method everyProperty
@@ -28099,7 +28167,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @deprecated Use `isEvery` instead
       @return {Boolean}
     */
-    everyProperty: mixin.aliasMethod("isEvery"),
+    everyProperty: mixin.aliasMethod('isEvery'),
 
     /**
       Returns `true` if the passed property resolves to `true` for all items in
@@ -28142,7 +28210,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @return {Boolean} `true` if the passed function returns `true` for any item
     */
     any: function (callback, target) {
-      var len = property_get.get(this, "length");
+      var len = property_get.get(this, 'length');
       var context = popCtx();
       var found = false;
       var last = null;
@@ -28191,7 +28259,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @return {Boolean} `true` if the passed function returns `true` for any item
       @deprecated Use `any` instead
     */
-    some: mixin.aliasMethod("any"),
+    some: mixin.aliasMethod('any'),
 
     /**
       Returns `true` if the passed property resolves to `true` for any item in
@@ -28213,7 +28281,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @return {Boolean}
       @deprecated Use `isAny` instead
     */
-    anyBy: mixin.aliasMethod("isAny"),
+    anyBy: mixin.aliasMethod('isAny'),
 
     /**
       @method someProperty
@@ -28222,7 +28290,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @return {Boolean}
       @deprecated Use `isAny` instead
     */
-    someProperty: mixin.aliasMethod("isAny"),
+    someProperty: mixin.aliasMethod('isAny'),
 
     /**
       This will combine the values of the enumerator into a single value. It
@@ -28251,7 +28319,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @return {Object} The reduced value.
     */
     reduce: function (callback, initialValue, reducerProperty) {
-      if (typeof callback !== "function") {
+      if (typeof callback !== 'function') {
         throw new TypeError();
       }
 
@@ -28283,7 +28351,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       this.forEach(function (x, idx) {
         var method = x && x[methodName];
 
-        if ("function" === typeof method) {
+        if ('function' === typeof method) {
           ret[idx] = args ? method.apply(x, args) : x[methodName]();
         }
       }, this);
@@ -28383,7 +28451,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @type Array
       @return this
     */
-    "[]": computed.computed({
+    '[]': computed.computed({
       get: function (key) {
         return this;
       }
@@ -28402,19 +28470,19 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @return this
     */
     addEnumerableObserver: function (target, opts) {
-      var willChange = opts && opts.willChange || "enumerableWillChange";
-      var didChange = opts && opts.didChange || "enumerableDidChange";
-      var hasObservers = property_get.get(this, "hasEnumerableObservers");
+      var willChange = opts && opts.willChange || 'enumerableWillChange';
+      var didChange = opts && opts.didChange || 'enumerableDidChange';
+      var hasObservers = property_get.get(this, 'hasEnumerableObservers');
 
       if (!hasObservers) {
-        property_events.propertyWillChange(this, "hasEnumerableObservers");
+        property_events.propertyWillChange(this, 'hasEnumerableObservers');
       }
 
-      events.addListener(this, "@enumerable:before", target, willChange);
-      events.addListener(this, "@enumerable:change", target, didChange);
+      events.addListener(this, '@enumerable:before', target, willChange);
+      events.addListener(this, '@enumerable:change', target, didChange);
 
       if (!hasObservers) {
-        property_events.propertyDidChange(this, "hasEnumerableObservers");
+        property_events.propertyDidChange(this, 'hasEnumerableObservers');
       }
 
       return this;
@@ -28428,19 +28496,19 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @return this
     */
     removeEnumerableObserver: function (target, opts) {
-      var willChange = opts && opts.willChange || "enumerableWillChange";
-      var didChange = opts && opts.didChange || "enumerableDidChange";
-      var hasObservers = property_get.get(this, "hasEnumerableObservers");
+      var willChange = opts && opts.willChange || 'enumerableWillChange';
+      var didChange = opts && opts.didChange || 'enumerableDidChange';
+      var hasObservers = property_get.get(this, 'hasEnumerableObservers');
 
       if (hasObservers) {
-        property_events.propertyWillChange(this, "hasEnumerableObservers");
+        property_events.propertyWillChange(this, 'hasEnumerableObservers');
       }
 
-      events.removeListener(this, "@enumerable:before", target, willChange);
-      events.removeListener(this, "@enumerable:change", target, didChange);
+      events.removeListener(this, '@enumerable:before', target, willChange);
+      events.removeListener(this, '@enumerable:change', target, didChange);
 
       if (hasObservers) {
-        property_events.propertyDidChange(this, "hasEnumerableObservers");
+        property_events.propertyDidChange(this, 'hasEnumerableObservers');
       }
 
       return this;
@@ -28453,7 +28521,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
       @type Boolean
     */
     hasEnumerableObservers: computed.computed(function () {
-      return events.hasListeners(this, "@enumerable:change") || events.hasListeners(this, "@enumerable:before");
+      return events.hasListeners(this, '@enumerable:change') || events.hasListeners(this, '@enumerable:before');
     }),
 
     /**
@@ -28470,18 +28538,18 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
     enumerableContentWillChange: function (removing, adding) {
       var removeCnt, addCnt, hasDelta;
 
-      if ("number" === typeof removing) {
+      if ('number' === typeof removing) {
         removeCnt = removing;
       } else if (removing) {
-        removeCnt = property_get.get(removing, "length");
+        removeCnt = property_get.get(removing, 'length');
       } else {
         removeCnt = removing = -1;
       }
 
-      if ("number" === typeof adding) {
+      if ('number' === typeof adding) {
         addCnt = adding;
       } else if (adding) {
-        addCnt = property_get.get(adding, "length");
+        addCnt = property_get.get(adding, 'length');
       } else {
         addCnt = adding = -1;
       }
@@ -28496,13 +28564,13 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
         adding = null;
       }
 
-      property_events.propertyWillChange(this, "[]");
+      property_events.propertyWillChange(this, '[]');
 
       if (hasDelta) {
-        property_events.propertyWillChange(this, "length");
+        property_events.propertyWillChange(this, 'length');
       }
 
-      events.sendEvent(this, "@enumerable:before", [this, removing, adding]);
+      events.sendEvent(this, '@enumerable:before', [this, removing, adding]);
 
       return this;
     },
@@ -28523,18 +28591,18 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
     enumerableContentDidChange: function (removing, adding) {
       var removeCnt, addCnt, hasDelta;
 
-      if ("number" === typeof removing) {
+      if ('number' === typeof removing) {
         removeCnt = removing;
       } else if (removing) {
-        removeCnt = property_get.get(removing, "length");
+        removeCnt = property_get.get(removing, 'length');
       } else {
         removeCnt = removing = -1;
       }
 
-      if ("number" === typeof adding) {
+      if ('number' === typeof adding) {
         addCnt = adding;
       } else if (adding) {
-        addCnt = property_get.get(adding, "length");
+        addCnt = property_get.get(adding, 'length');
       } else {
         addCnt = adding = -1;
       }
@@ -28549,13 +28617,13 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-metal/core', 'ember
         adding = null;
       }
 
-      events.sendEvent(this, "@enumerable:change", [this, removing, adding]);
+      events.sendEvent(this, '@enumerable:change', [this, removing, adding]);
 
       if (hasDelta) {
-        property_events.propertyDidChange(this, "length");
+        property_events.propertyDidChange(this, 'length');
       }
 
-      property_events.propertyDidChange(this, "[]");
+      property_events.propertyDidChange(this, '[]');
 
       return this;
     },
@@ -28735,25 +28803,33 @@ enifed('ember-runtime/mixins/mutable_array', ['exports', 'ember-metal/property_g
 
   'use strict';
 
-  /**
-  @module ember
-  @submodule ember-runtime
-  */
 
-  // require('ember-runtime/mixins/array');
-  // require('ember-runtime/mixins/mutable_enumerable');
-
-  // ..........................................................
-  // CONSTANTS
-  //
-
-  var OUT_OF_RANGE_EXCEPTION = "Index out of range";
-  var EMPTY = [];
 
   // ..........................................................
   // HELPERS
   //
 
+  var OUT_OF_RANGE_EXCEPTION = "Index out of range";
+  var EMPTY = []; /**
+                    This mixin defines the API for modifying array-like objects. These methods
+                    can be applied only to a collection that keeps its items in an ordered set.
+                    It builds upon the Array mixin and adds methods to modify the array.
+                    Concrete implementations of this class include ArrayProxy and ArrayController.
+                  
+                    It is important to use the methods in this class to modify arrays so that
+                    changes are observable. This allows the binding system in Ember to function
+                    correctly.
+                  
+                  
+                    Note that an Array can change even if it does not implement this mixin.
+                    For example, one might implement a SparseArray that cannot be directly
+                    modified, but if its underlying enumerable changes, it will change also.
+                  
+                    @class MutableArray
+                    @namespace Ember
+                    @uses Ember.Array
+                    @uses Ember.MutableEnumerable
+                  */
   exports['default'] = mixin.Mixin.create(EmberArray['default'], MutableEnumerable['default'], {
 
     /**
@@ -29521,7 +29597,7 @@ enifed('ember-runtime/mixins/promise_proxy', ['exports', 'ember-metal/property_g
   }
 
   /**
-    A low level mixin making ObjectProxy, ObjectController or ArrayController's promise aware.
+    A low level mixin making ObjectProxy, ObjectController or ArrayControllers promise-aware.
 
     ```javascript
     var ObjectPromiseController = Ember.ObjectController.extend(Ember.PromiseProxyMixin);
@@ -30419,7 +30495,7 @@ enifed('ember-runtime/system/container', ['exports', 'ember-metal/property_set',
 	exports.Container = Container['default'];
 
 });
-enifed('ember-runtime/system/core_object', ['exports', 'ember-metal', 'ember-metal/merge', 'ember-metal/property_get', 'ember-metal/utils', 'ember-metal/platform/create', 'ember-metal/chains', 'ember-metal/events', 'ember-metal/mixin', 'ember-metal/enumerable_utils', 'ember-metal/error', 'ember-metal/platform/define_property', 'ember-metal/keys', 'ember-runtime/mixins/action_handler', 'ember-metal/properties', 'ember-metal/binding', 'ember-metal/computed', 'ember-metal/injected_property', 'ember-metal/run_loop', 'ember-metal/watching', 'ember-metal/core', 'ember-runtime/inject'], function (exports, Ember, merge, property_get, utils, o_create, chains, events, mixin, enumerable_utils, EmberError, define_property, keys, ActionHandler, ember_metal__properties, binding, computed, InjectedProperty, run, watching, core, inject) {
+enifed('ember-runtime/system/core_object', ['exports', 'ember-metal', 'ember-metal/merge', 'ember-metal/property_get', 'ember-metal/utils', 'ember-metal/platform/create', 'ember-metal/chains', 'ember-metal/events', 'ember-metal/mixin', 'ember-metal/enumerable_utils', 'ember-metal/error', 'ember-metal/platform/define_property', 'ember-metal/keys', 'ember-runtime/mixins/action_handler', 'ember-metal/properties', 'ember-metal/binding', 'ember-metal/computed', 'ember-metal/injected_property', 'ember-metal/run_loop', 'ember-metal/watching', 'ember-metal/core', 'ember-runtime/inject'], function (exports, Ember, merge, property_get, utils, o_create, chains, events, mixin, enumerable_utils, EmberError, define_property, keys, ActionHandler, ember_metal__properties, ember_metal__binding, computed, InjectedProperty, run, watching, core, inject) {
 
   
   // Remove "use strict"; from transpiled module until
@@ -30763,8 +30839,8 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-metal', 'ember-met
     },
 
     bind: function (to, from) {
-      if (!(from instanceof binding.Binding)) {
-        from = binding.Binding.from(from);
+      if (!(from instanceof ember_metal__binding.Binding)) {
+        from = ember_metal__binding.Binding.from(from);
       }
       from.to(to).connect(this);
       return from;
@@ -30924,8 +31000,8 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-metal', 'ember-met
       @param [arguments]*
     */
     createWithMixins: function () {
-      for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
+      for (var _len2 = arguments.length, args = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
       }
 
       var C = this;
@@ -30965,8 +31041,8 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-metal', 'ember-met
       @param [arguments]*
     */
     create: function () {
-      for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
+      for (var _len3 = arguments.length, args = Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+        args[_key3] = arguments[_key3];
       }
 
       var C = this;
@@ -31501,7 +31577,7 @@ enifed('ember-runtime/system/lazy_load', ['exports', 'ember-metal/core', 'ember-
   }
 
 });
-enifed('ember-runtime/system/namespace', ['exports', 'ember-metal/core', 'ember-metal/property_get', 'ember-metal/array', 'ember-metal/utils', 'ember-metal/mixin', 'ember-runtime/system/object'], function (exports, Ember, property_get, array, utils, mixin, EmberObject) {
+enifed('ember-runtime/system/namespace', ['exports', 'ember-metal/core', 'ember-metal/property_get', 'ember-metal/array', 'ember-metal/utils', 'ember-metal/mixin', 'ember-runtime/system/object'], function (exports, Ember, property_get, array, utils, ember_metal__mixin, EmberObject) {
 
   'use strict';
 
@@ -31710,7 +31786,7 @@ enifed('ember-runtime/system/namespace', ['exports', 'ember-metal/core', 'ember-
     };
   }
 
-  mixin.Mixin.prototype.toString = classToString; // ES6TODO: altering imported objects. SBB.
+  ember_metal__mixin.Mixin.prototype.toString = classToString; // ES6TODO: altering imported objects. SBB.
 
   exports['default'] = Namespace;
 
@@ -31859,7 +31935,7 @@ enifed('ember-runtime/system/native_array', ['exports', 'ember-metal/core', 'emb
   NativeArray.activate = function () {
     NativeArray.apply(Array.prototype);
 
-    A = function (arr) {
+    exports.A = A = function (arr) {
       return arr || [];
     };
   };
@@ -31903,7 +31979,7 @@ enifed('ember-runtime/system/service', ['exports', 'ember-runtime/system/object'
 
   'use strict';
 
-  inject.createInjectionHelper("service");
+  inject.createInjectionHelper('service');
 
   /**
     @class Service
@@ -33106,22 +33182,22 @@ enifed('ember-template-compiler/compat/precompile', ['exports', 'ember-template-
   var compile, compileSpec;
 
   exports['default'] = function (string) {
-    if ((!compile || !compileSpec) && Ember.__loader.registry["htmlbars-compiler/compiler"]) {
-      var Compiler = requireModule("htmlbars-compiler/compiler");
+    if ((!compile || !compileSpec) && Ember.__loader.registry['htmlbars-compiler/compiler']) {
+      var Compiler = requireModule('htmlbars-compiler/compiler');
 
       compile = Compiler.compile;
       compileSpec = Compiler.compileSpec;
     }
 
     if (!compile || !compileSpec) {
-      throw new Error("Cannot call `precompile` without the template compiler loaded. Please load `ember-template-compiler.js` prior to calling `precompile`.");
+      throw new Error('Cannot call `precompile` without the template compiler loaded. Please load `ember-template-compiler.js` prior to calling `precompile`.');
     }
 
     var asObject = arguments[1] === undefined ? true : arguments[1];
     var compileFunc = asObject ? compile : compileSpec;
 
     return compileFunc(string, compileOptions['default']());
-  };
+  }
 
 });
 enifed('ember-template-compiler/plugins', ['exports'], function (exports) {
@@ -33141,7 +33217,7 @@ enifed('ember-template-compiler/plugins', ['exports'], function (exports) {
   };
   function registerPlugin(type, Plugin) {
     if (!plugins[type]) {
-      throw new Error("Attempting to register \"" + Plugin + "\" as \"" + type + "\" which is not a valid HTMLBars plugin type.");
+      throw new Error('Attempting to register "' + Plugin + '" as "' + type + '" which is not a valid HTMLBars plugin type.');
     }
 
     plugins[type].push(Plugin);
@@ -33177,9 +33253,10 @@ enifed('ember-template-compiler/plugins/transform-each-in-to-hash', ['exports'],
     @class TransformEachInToHash
     @private
   */
-  function TransformEachInToHash() {
+  function TransformEachInToHash(options) {
     // set later within HTMLBars to the syntax package
     this.syntax = null;
+    this.options = options || {};
   }
 
   /**
@@ -33196,7 +33273,7 @@ enifed('ember-template-compiler/plugins/transform-each-in-to-hash', ['exports'],
       if (pluginContext.validate(node)) {
 
         if (node.program && node.program.blockParams.length) {
-          throw new Error("You cannot use keyword (`{{each foo in bar}}`) and block params (`{{each bar as |foo|}}`) at the same time.");
+          throw new Error('You cannot use keyword (`{{each foo in bar}}`) and block params (`{{each bar as |foo|}}`) at the same time.');
         }
 
         var removedParams = node.sexpr.params.splice(0, 2);
@@ -33207,7 +33284,7 @@ enifed('ember-template-compiler/plugins/transform-each-in-to-hash', ['exports'],
           node.sexpr.hash = b.hash();
         }
 
-        node.sexpr.hash.pairs.push(b.pair("keyword", b.string(keyword)));
+        node.sexpr.hash.pairs.push(b.pair('keyword', b.string(keyword)));
       }
     });
 
@@ -33215,7 +33292,7 @@ enifed('ember-template-compiler/plugins/transform-each-in-to-hash', ['exports'],
   };
 
   TransformEachInToHash.prototype.validate = function TransformEachInToHash_validate(node) {
-    return (node.type === "BlockStatement" || node.type === "MustacheStatement") && node.sexpr.path.original === "each" && node.sexpr.params.length === 3 && node.sexpr.params[1].type === "PathExpression" && node.sexpr.params[1].original === "in";
+    return (node.type === 'BlockStatement' || node.type === 'MustacheStatement') && node.sexpr.path.original === 'each' && node.sexpr.params.length === 3 && node.sexpr.params[1].type === 'PathExpression' && node.sexpr.params[1].original === 'in';
   };
 
   exports['default'] = TransformEachInToHash;
@@ -33248,9 +33325,10 @@ enifed('ember-template-compiler/plugins/transform-with-as-to-hash', ['exports'],
     @private
     @class TransformWithAsToHash
   */
-  function TransformWithAsToHash() {
+  function TransformWithAsToHash(options) {
     // set later within HTMLBars to the syntax package
     this.syntax = null;
+    this.options = options;
   }
 
   /**
@@ -33261,6 +33339,7 @@ enifed('ember-template-compiler/plugins/transform-with-as-to-hash', ['exports'],
   TransformWithAsToHash.prototype.transform = function TransformWithAsToHash_transform(ast) {
     var pluginContext = this;
     var walker = new pluginContext.syntax.Walker();
+    var moduleName = this.options.moduleName;
 
     walker.visit(ast, function (node) {
       if (pluginContext.validate(node)) {
@@ -33269,6 +33348,8 @@ enifed('ember-template-compiler/plugins/transform-with-as-to-hash', ['exports'],
           throw new Error("You cannot use keyword (`{{with foo as bar}}`) and block params (`{{with foo as |bar|}}`) at the same time.");
         }
 
+        Ember.deprecate("Using {{with}} without block syntax is deprecated. " + "Please use standard block form (`{{#with foo as |bar|}}`) " + (moduleName ? " in `" + moduleName + "` " : "") + "instead.", false, { url: "http://emberjs.com/deprecations/v1.x/#toc_code-as-code-sytnax-for-code-with-code" });
+
         var removedParams = node.sexpr.params.splice(1, 2);
         var keyword = removedParams[1].original;
         node.program.blockParams = [keyword];
@@ -33289,13 +33370,18 @@ enifed('ember-template-compiler/system/compile', ['exports', 'ember-template-com
 
   'use strict';
 
-  /**
-  @module ember
-  @submodule ember-template-compiler
-  */
 
-  var compile;
-  exports['default'] = function (templateString) {
+  var compile; /**
+                 Uses HTMLBars `compile` function to process a string into a compiled template.
+               
+                 This is not present in production builds.
+               
+                 @private
+                 @method compile
+                 @param {String} templateString This is the string to be compiled by HTMLBars.
+                 @param {Object} options This is an options hash to augment the compiler options.
+               */
+  exports['default'] = function (templateString, options) {
     if (!compile && Ember.__loader.registry["htmlbars-compiler/compiler"]) {
       compile = requireModule("htmlbars-compiler/compiler").compile;
     }
@@ -33304,10 +33390,10 @@ enifed('ember-template-compiler/system/compile', ['exports', 'ember-template-com
       throw new Error("Cannot call `compile` without the template compiler loaded. Please load `ember-template-compiler.js` prior to calling `compile`.");
     }
 
-    var templateSpec = compile(templateString, compileOptions['default']());
+    var templateSpec = compile(templateString, compileOptions['default'](options));
 
     return template['default'](templateSpec);
-  };
+  }
 
 });
 enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-metal/core', 'ember-template-compiler/plugins'], function (exports, Ember, plugins) {
@@ -33319,17 +33405,23 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
   @submodule ember-template-compiler
   */
 
-  exports['default'] = function () {
+  exports['default'] = function (_options) {
     var disableComponentGeneration = true;
     
-    return {
-      revision: "Ember@1.12.0-beta.1",
+    var options = _options || {};
+    // When calling `Ember.Handlebars.compile()` a second argument of `true`
+    // had a special meaning (long since lost), this just gaurds against
+    // `options` being true, and causing an error during compilation.
+    if (options === true) {
+      options = {};
+    }
 
-      disableComponentGeneration: disableComponentGeneration,
+    options.revision = "Ember@1.12.0-beta.3";
+    options.disableComponentGeneration = disableComponentGeneration;
+    options.plugins = plugins['default'];
 
-      plugins: plugins['default']
-    };
-  };
+    return options;
+  }
 
 });
 enifed('ember-template-compiler/system/precompile', ['exports', 'ember-template-compiler/system/compile_options'], function (exports, compileOptions) {
@@ -33353,17 +33445,17 @@ enifed('ember-template-compiler/system/precompile', ['exports', 'ember-template-
     @method precompile
     @param {String} templateString This is the string to be compiled by HTMLBars.
   */
-  exports['default'] = function (templateString) {
-    if (!compileSpec && Ember.__loader.registry["htmlbars-compiler/compiler"]) {
-      compileSpec = requireModule("htmlbars-compiler/compiler").compileSpec;
+  exports['default'] = function (templateString, options) {
+    if (!compileSpec && Ember.__loader.registry['htmlbars-compiler/compiler']) {
+      compileSpec = requireModule('htmlbars-compiler/compiler').compileSpec;
     }
 
     if (!compileSpec) {
-      throw new Error("Cannot call `compileSpec` without the template compiler loaded. Please load `ember-template-compiler.js` prior to calling `compileSpec`.");
+      throw new Error('Cannot call `compileSpec` without the template compiler loaded. Please load `ember-template-compiler.js` prior to calling `compileSpec`.');
     }
 
-    return compileSpec(templateString, compileOptions['default']());
-  };
+    return compileSpec(templateString, compileOptions['default'](options));
+  }
 
 });
 enifed('ember-template-compiler/system/template', ['exports'], function (exports) {
@@ -33389,7 +33481,7 @@ enifed('ember-template-compiler/system/template', ['exports'], function (exports
     templateSpec.isMethod = false;
 
     return templateSpec;
-  };
+  }
 
 });
 enifed('ember-testing', ['ember-metal/core', 'ember-testing/initializers', 'ember-testing/support', 'ember-testing/setup_for_testing', 'ember-testing/test', 'ember-testing/adapters/adapter', 'ember-testing/adapters/qunit', 'ember-testing/helpers'], function (Ember, __dep1__, __dep2__, setupForTesting, Test, Adapter, QUnitAdapter) {
@@ -33948,9 +34040,9 @@ enifed('ember-testing/initializers', ['ember-runtime/system/lazy_load'], functio
 
   'use strict';
 
-  var name = "deferReadiness in `testing` mode";
+  var name = 'deferReadiness in `testing` mode';
 
-  lazy_load.onLoad("Ember.Application", function (Application) {
+  lazy_load.onLoad('Ember.Application', function (Application) {
     if (!Application.initializers[name]) {
       Application.initializer({
         name: name,
@@ -34476,8 +34568,8 @@ enifed('ember-testing/test', ['exports', 'ember-metal/core', 'ember-metal/run_lo
   // of helper chaining
   function protoWrap(proto, name, callback, isAsync) {
     proto[name] = function () {
-      for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
+      for (var _len2 = arguments.length, args = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
       }
 
       if (isAsync) {
@@ -34609,7 +34701,7 @@ enifed('ember-views/attr_nodes/attr_node', ['exports', 'ember-metal/core', 'embe
     this.init(attrName, attrValue);
   }
 
-  var styleWarning = "Binding style attributes may introduce cross-site scripting vulnerabilities; " + "please ensure that values being bound are properly escaped. For more information, " + "including how to disable this warning, see " + "http://emberjs.com/deprecations/v1.x/#toc_warning-when-binding-style-attributes.";
+  var styleWarning = "Binding style attributes may introduce cross-site scripting vulnerabilities; " + "please ensure that values being bound are properly escaped. For more information, " + "including how to disable this warning, see " + "http://emberjs.com/deprecations/v1.x/#toc_binding-style-attributes.";
 
   AttrNode.prototype.init = function init(attrName, simpleAttrValue) {
     this.isAttrNode = true;
@@ -34760,12 +34852,12 @@ enifed('ember-views/component_lookup', ['exports', 'ember-runtime/system/object'
 
       container = container || this.container;
 
-      var fullName = "component:" + name;
-      var templateFullName = "template:components/" + name;
+      var fullName = 'component:' + name;
+      var templateFullName = 'template:components/' + name;
       var templateRegistered = container && container._registry.has(templateFullName);
 
       if (templateRegistered) {
-        container._registry.injection(fullName, "layout", templateFullName);
+        container._registry.injection(fullName, 'layout', templateFullName);
       }
 
       var Component = container.lookupFactory(fullName);
@@ -34787,8 +34879,16 @@ enifed('ember-views/mixins/attribute_bindings_support', ['exports', 'ember-metal
 
   'use strict';
 
+  /**
+  @module ember
+  @submodule ember-views
+  */
   var EMPTY_ARRAY = [];
 
+  /**
+    @class AttributeBindingsSupport
+    @namespace Ember
+  */
   var AttributeBindingsSupport = mixin.Mixin.create({
     concatenatedProperties: ["attributeBindings"],
 
@@ -34816,6 +34916,8 @@ enifed('ember-views/mixins/attribute_bindings_support', ['exports', 'ember-metal
     */
     attributeBindings: EMPTY_ARRAY,
 
+    _attrNodes: EMPTY_ARRAY,
+
     _unspecifiedAttributeBindings: null,
 
     /**
@@ -34898,8 +35000,16 @@ enifed('ember-views/mixins/class_names_support', ['exports', 'ember-metal/core',
 
   'use strict';
 
+  /**
+  @module ember
+  @submodule ember-views
+  */
   var EMPTY_ARRAY = [];
 
+  /**
+    @class ClassNamesSupport
+    @namespace Ember
+  */
   var ClassNamesSupport = mixin.Mixin.create({
     concatenatedProperties: ["classNames", "classNameBindings"],
 
@@ -35073,25 +35183,25 @@ enifed('ember-views/mixins/component_template_deprecation', ['exports', 'ember-m
       this._super.apply(this, arguments);
 
       var deprecatedProperty, replacementProperty;
-      var layoutSpecified = props.layoutName || props.layout || property_get.get(this, "layoutName");
+      var layoutSpecified = props.layoutName || props.layout || property_get.get(this, 'layoutName');
 
       if (props.templateName && !layoutSpecified) {
-        deprecatedProperty = "templateName";
-        replacementProperty = "layoutName";
+        deprecatedProperty = 'templateName';
+        replacementProperty = 'layoutName';
 
         props.layoutName = props.templateName;
-        delete props["templateName"];
+        delete props['templateName'];
       }
 
       if (props.template && !layoutSpecified) {
-        deprecatedProperty = "template";
-        replacementProperty = "layout";
+        deprecatedProperty = 'template';
+        replacementProperty = 'layout';
 
         props.layout = props.template;
-        delete props["template"];
+        delete props['template'];
       }
 
-      Ember['default'].deprecate("Do not specify " + deprecatedProperty + " on a Component, use " + replacementProperty + " instead.", !deprecatedProperty);
+      Ember['default'].deprecate('Do not specify ' + deprecatedProperty + ' on a Component, use ' + replacementProperty + ' instead.', !deprecatedProperty);
     }
   });
 
@@ -35100,6 +35210,10 @@ enifed('ember-views/mixins/instrumentation_support', ['exports', 'ember-metal/mi
 
   'use strict';
 
+  /**
+  @module ember
+  @submodule ember-views
+  */
   var InstrumentationSupport = mixin.Mixin.create({
     /**
       Used to identify this view during debugging
@@ -35127,6 +35241,10 @@ enifed('ember-views/mixins/legacy_view_support', ['exports', 'ember-metal/core',
 
   'use strict';
 
+  /**
+  @module ember
+  @submodule ember-views
+  */
   var LegacyViewSupport = mixin.Mixin.create({
     beforeRender: function (buffer) {},
 
@@ -35251,6 +35369,10 @@ enifed('ember-views/mixins/template_rendering_support', ['exports', 'ember-metal
 
   'use strict';
 
+  /**
+  @module ember
+  @submodule ember-views
+  */
   var _renderView;
   function renderView(view, buffer, template) {
     if (_renderView === undefined) {
@@ -35259,6 +35381,10 @@ enifed('ember-views/mixins/template_rendering_support', ['exports', 'ember-metal
     _renderView(view, buffer, template);
   }
 
+  /**
+    @class TemplateRenderingSupport
+    @namespace Ember
+  */
   var TemplateRenderingSupport = mixin.Mixin.create({
     /**
       Called on your view when it should push strings of HTML into a
@@ -35500,6 +35626,10 @@ enifed('ember-views/mixins/view_child_views_support', ['exports', 'ember-metal/c
 
   'use strict';
 
+  /**
+  @module ember
+  @submodule ember-views
+  */
   var childViewsProperty = computed.computed(function () {
     var childViews = this._childViews;
     var ret = native_array.A();
@@ -35638,6 +35768,10 @@ enifed('ember-views/mixins/view_context_support', ['exports', 'ember-metal/mixin
 
   'use strict';
 
+  /**
+  @module ember
+  @submodule ember-views
+  */
   var ViewContextSupport = mixin.Mixin.create({
     /**
       The object from which templates should access properties.
@@ -35900,10 +36034,18 @@ enifed('ember-views/mixins/visibility_support', ['exports', 'ember-metal/mixin',
 
   'use strict';
 
+  /**
+  @module ember
+  @submodule ember-views
+  */
   function K() {
     return this;
   }
 
+  /**
+    @class VisibilitySupport
+    @namespace Ember
+  */
   var VisibilitySupport = mixin.Mixin.create({
     /**
       If `false`, the view will appear hidden in DOM.
@@ -36110,7 +36252,7 @@ enifed('ember-views/streams/context_stream', ['exports', 'ember-metal/core', 'em
   'use strict';
 
   function ContextStream(view) {
-    Ember['default'].assert("ContextStream error: the argument is not a view", view && view.isView);
+    Ember['default'].assert('ContextStream error: the argument is not a view', view && view.isView);
 
     this.init();
     this.view = view;
@@ -36124,10 +36266,10 @@ enifed('ember-views/streams/context_stream', ['exports', 'ember-metal/core', 'em
     _makeChildStream: function (key, _fullPath) {
       var stream;
 
-      if (key === "" || key === "this") {
+      if (key === '' || key === 'this') {
         stream = this.view._baseContext;
       } else if (path_cache.isGlobal(key) && Ember['default'].lookup[key]) {
-        Ember['default'].deprecate("Global lookup of " + _fullPath + " from a Handlebars template is deprecated.");
+        Ember['default'].deprecate('Global lookup of ' + _fullPath + ' from a Handlebars template is deprecated.');
         stream = new SimpleStream['default'](Ember['default'].lookup[key]);
         stream._isGlobal = true;
       } else if (key in this.view._keywords) {
@@ -36138,7 +36280,7 @@ enifed('ember-views/streams/context_stream', ['exports', 'ember-metal/core', 'em
 
       stream._isRoot = true;
 
-      if (key === "controller") {
+      if (key === 'controller') {
         stream._isController = true;
       }
 
@@ -36154,8 +36296,8 @@ enifed('ember-views/streams/key_stream', ['exports', 'ember-metal/core', 'ember-
   'use strict';
 
   function KeyStream(source, key) {
-    Ember['default'].assert("KeyStream error: key must be a non-empty string", typeof key === "string" && key.length > 0);
-    Ember['default'].assert("KeyStream error: key must not have a '.'", key.indexOf(".") === -1);
+    Ember['default'].assert('KeyStream error: key must be a non-empty string', typeof key === 'string' && key.length > 0);
+    Ember['default'].assert('KeyStream error: key must not have a \'.\'', key.indexOf('.') === -1);
 
     this.init();
     this.source = source;
@@ -36175,11 +36317,11 @@ enifed('ember-views/streams/key_stream', ['exports', 'ember-metal/core', 'ember-
       var nextObj = utils.read(this.source);
 
       if (nextObj !== prevObj) {
-        if (prevObj && typeof prevObj === "object") {
+        if (prevObj && typeof prevObj === 'object') {
           observer.removeObserver(prevObj, this.key, this, this._didChange);
         }
 
-        if (nextObj && typeof nextObj === "object") {
+        if (nextObj && typeof nextObj === 'object') {
           observer.addObserver(nextObj, this.key, this, this._didChange);
         }
 
@@ -36198,7 +36340,7 @@ enifed('ember-views/streams/key_stream', ['exports', 'ember-metal/core', 'ember-
     },
 
     setSource: function (nextSource) {
-      Ember['default'].assert("KeyStream error: source must be an object", typeof nextSource === "object");
+      Ember['default'].assert('KeyStream error: source must be an object', typeof nextSource === 'object');
 
       var prevSource = this.source;
 
@@ -36228,7 +36370,7 @@ enifed('ember-views/streams/key_stream', ['exports', 'ember-metal/core', 'ember-
           this.source.unsubscribe(this._didChange, this);
         }
 
-        if (this.obj && typeof this.obj === "object") {
+        if (this.obj && typeof this.obj === 'object') {
           observer.removeObserver(this.obj, this.key, this, this._didChange);
         }
 
@@ -36620,8 +36762,8 @@ enifed('ember-views/system/ext', ['ember-metal/run_loop'], function (run) {
 	@submodule ember-views
 	*/
 
-	run['default']._addQueue("render", "actions");
-	run['default']._addQueue("afterRender", "render");
+	run['default']._addQueue('render', 'actions');
+	run['default']._addQueue('afterRender', 'render');
 
 });
 enifed('ember-views/system/jquery', ['exports', 'ember-metal/core', 'ember-metal/enumerable_utils', 'ember-metal/environment'], function (exports, Ember, enumerable_utils, environment) {
@@ -36633,11 +36775,11 @@ enifed('ember-views/system/jquery', ['exports', 'ember-metal/core', 'ember-metal
   if (environment['default'].hasDOM) {
     // mainContext is set in `package/loader/lib/main.js` to the `this` context before entering strict mode
     jQuery = Ember['default'].imports && Ember['default'].imports.jQuery || mainContext && mainContext.jQuery; //jshint ignore:line
-    if (!jQuery && typeof eriuqer === "function") {
-      jQuery = eriuqer("jquery");
+    if (!jQuery && typeof eriuqer === 'function') {
+      jQuery = eriuqer('jquery');
     }
 
-    Ember['default'].assert("Ember Views require jQuery between 1.7 and 2.1", jQuery && (jQuery().jquery.match(/^((1\.(7|8|9|10|11))|(2\.(0|1)))(\.\d+)?(pre|rc\d?)?/) || Ember['default'].ENV.FORCE_JQUERY));
+    Ember['default'].assert('Ember Views require jQuery between 1.7 and 2.1', jQuery && (jQuery().jquery.match(/^((1\.(7|8|9|10|11))|(2\.(0|1)))(\.\d+)?(pre|rc\d?)?/) || Ember['default'].ENV.FORCE_JQUERY));
 
     /**
     @module ember
@@ -36645,13 +36787,13 @@ enifed('ember-views/system/jquery', ['exports', 'ember-metal/core', 'ember-metal
     */
     if (jQuery) {
       // http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#dndevents
-      var dragEvents = ["dragstart", "drag", "dragenter", "dragleave", "dragover", "drop", "dragend"];
+      var dragEvents = ['dragstart', 'drag', 'dragenter', 'dragleave', 'dragover', 'drop', 'dragend'];
 
       // Copies the `dataTransfer` property from a browser event object onto the
       // jQuery event object for the specified events
       enumerable_utils.forEach(dragEvents, function (eventName) {
         jQuery.event.fixHooks[eventName] = {
-          props: ["dataTransfer"]
+          props: ['dataTransfer']
         };
       });
     }
@@ -36690,13 +36832,13 @@ enifed('ember-views/system/platform', ['exports', 'ember-metal/environment'], fu
   'use strict';
 
   var canSetNameOnInputs = environment['default'].hasDOM && (function () {
-    var div = document.createElement("div");
-    var el = document.createElement("input");
+    var div = document.createElement('div');
+    var el = document.createElement('input');
 
-    el.setAttribute("name", "foo");
+    el.setAttribute('name', 'foo');
     div.appendChild(el);
 
-    return !!div.innerHTML.match("foo");
+    return !!div.innerHTML.match('foo');
   })();
 
   exports.canSetNameOnInputs = canSetNameOnInputs;
@@ -37263,7 +37405,7 @@ enifed('ember-views/system/renderer', ['exports', 'ember-metal/core', 'ember-met
   EmberRenderer.prototype._super$constructor = Renderer['default'];
 
   EmberRenderer.prototype.scheduleRender = function EmberRenderer_scheduleRender(ctx, fn) {
-    return run['default'].scheduleOnce("render", ctx, fn);
+    return run['default'].scheduleOnce('render', ctx, fn);
   };
 
   EmberRenderer.prototype.cancelRender = function EmberRenderer_cancelRender(id) {
@@ -37276,18 +37418,18 @@ enifed('ember-views/system/renderer', ['exports', 'ember-metal/core', 'ember-met
     // provided buffer operation (for example, `insertAfter` will
     // insert a new buffer after the "parent buffer").
     var tagName = view.tagName;
-    if (tagName !== null && typeof tagName === "object" && tagName.isDescriptor) {
-      tagName = property_get.get(view, "tagName");
-      Ember['default'].deprecate("In the future using a computed property to define tagName will not be permitted. That value will be respected, but changing it will not update the element.", !tagName);
+    if (tagName !== null && typeof tagName === 'object' && tagName.isDescriptor) {
+      tagName = property_get.get(view, 'tagName');
+      Ember['default'].deprecate('In the future using a computed property to define tagName will not be permitted. That value will be respected, but changing it will not update the element.', !tagName);
     }
     var classNameBindings = view.classNameBindings;
-    var taglessViewWithClassBindings = tagName === "" && (classNameBindings && classNameBindings.length > 0);
+    var taglessViewWithClassBindings = tagName === '' && (classNameBindings && classNameBindings.length > 0);
 
     if (tagName === null || tagName === undefined) {
-      tagName = "div";
+      tagName = 'div';
     }
 
-    Ember['default'].assert("You cannot use `classNameBindings` on a tag-less view: " + view.toString(), !taglessViewWithClassBindings);
+    Ember['default'].assert('You cannot use `classNameBindings` on a tag-less view: ' + view.toString(), !taglessViewWithClassBindings);
 
     var buffer = view.buffer = this.buffer;
     buffer.reset(tagName, contextualElement);
@@ -37296,7 +37438,7 @@ enifed('ember-views/system/renderer', ['exports', 'ember-metal/core', 'ember-met
       view.beforeRender(buffer);
     }
 
-    if (tagName !== "") {
+    if (tagName !== '') {
       if (view.applyAttributesToBuffer) {
         view.applyAttributesToBuffer(buffer);
       }
@@ -37326,24 +37468,27 @@ enifed('ember-views/system/renderer', ['exports', 'ember-metal/core', 'ember-met
   };
 
   EmberRenderer.prototype.childViews = function childViews(view) {
-    return view._childViews;
+    if (view._attrNodes && view._childViews) {
+      return view._attrNodes.concat(view._childViews);
+    }
+    return view._attrNodes || view._childViews;
   };
 
   Renderer['default'].prototype.willCreateElement = function (view) {
     if (instrumentation.subscribers.length && view.instrumentDetails) {
-      view._instrumentEnd = instrumentation._instrumentStart("render." + view.instrumentName, function viewInstrumentDetails() {
+      view._instrumentEnd = instrumentation._instrumentStart('render.' + view.instrumentName, function viewInstrumentDetails() {
         var details = {};
         view.instrumentDetails(details);
         return details;
       });
     }
     if (view._transitionTo) {
-      view._transitionTo("inBuffer");
+      view._transitionTo('inBuffer');
     }
   }; // inBuffer
   Renderer['default'].prototype.didCreateElement = function (view) {
     if (view._transitionTo) {
-      view._transitionTo("hasElement");
+      view._transitionTo('hasElement');
     }
     if (view._instrumentEnd) {
       view._instrumentEnd();
@@ -37352,18 +37497,18 @@ enifed('ember-views/system/renderer', ['exports', 'ember-metal/core', 'ember-met
   Renderer['default'].prototype.willInsertElement = function (view) {
     if (this._destinedForDOM) {
       if (view.trigger) {
-        view.trigger("willInsertElement");
+        view.trigger('willInsertElement');
       }
     }
   }; // will place into DOM
   Renderer['default'].prototype.didInsertElement = function (view) {
     if (view._transitionTo) {
-      view._transitionTo("inDOM");
+      view._transitionTo('inDOM');
     }
 
     if (this._destinedForDOM) {
       if (view.trigger) {
-        view.trigger("didInsertElement");
+        view.trigger('didInsertElement');
       }
     }
   }; // inDOM // placed into DOM
@@ -37376,8 +37521,8 @@ enifed('ember-views/system/renderer', ['exports', 'ember-metal/core', 'ember-met
         view._willDestroyElement();
       }
       if (view.trigger) {
-        view.trigger("willDestroyElement");
-        view.trigger("willClearRender");
+        view.trigger('willDestroyElement');
+        view.trigger('willClearRender');
       }
     }
   };
@@ -37385,7 +37530,7 @@ enifed('ember-views/system/renderer', ['exports', 'ember-metal/core', 'ember-met
   Renderer['default'].prototype.didDestroyElement = function (view) {
     view.element = null;
     if (view._transitionTo) {
-      view._transitionTo("preRender");
+      view._transitionTo('preRender');
     }
   }; // element destroyed so view.destroy shouldn't try to remove it removedFromDOM
 
@@ -37434,7 +37579,7 @@ enifed('ember-views/system/utils', ['exports'], function (exports) {
   }
 
 });
-enifed('ember-views/views/bound_component_view', ['exports', 'ember-views/views/metamorph_view', 'ember-metal/streams/utils', 'ember-views/streams/utils', 'ember-htmlbars/system/merge-view-bindings', 'ember-metal/error', 'ember-views/views/container_view'], function (exports, metamorph_view, utils, streams__utils, mergeViewBindings, EmberError, ContainerView) {
+enifed('ember-views/views/bound_component_view', ['exports', 'ember-views/views/metamorph_view', 'ember-metal/streams/utils', 'ember-views/streams/utils', 'ember-htmlbars/system/merge-view-bindings', 'ember-metal/error', 'ember-views/views/container_view', 'ember-views/views/view'], function (exports, metamorph_view, utils, streams__utils, mergeViewBindings, EmberError, ContainerView, View) {
 
   'use strict';
 
@@ -37446,24 +37591,25 @@ enifed('ember-views/views/bound_component_view', ['exports', 'ember-views/views/
   exports['default'] = ContainerView['default'].extend(metamorph_view._Metamorph, {
     init: function () {
       this._super.apply(this, arguments);
-      var componentNameStream = this._boundComponentOptions.componentNameStream;
-      var container = this.container;
-      this.componentClassStream = utils.chain(componentNameStream, function () {
-        return streams__utils.readComponentFactory(componentNameStream, container);
-      });
+      this.componentNameStream = this._boundComponentOptions.componentNameStream;
 
-      utils.subscribe(this.componentClassStream, this._updateBoundChildComponent, this);
+      utils.subscribe(this.componentNameStream, this._updateBoundChildComponent, this);
       this._updateBoundChildComponent();
     },
     willDestroy: function () {
-      utils.unsubscribe(this.componentClassStream, this._updateBoundChildComponent, this);
+      utils.unsubscribe(this.componentNameStream, this._updateBoundChildComponent, this);
       this._super.apply(this, arguments);
     },
     _updateBoundChildComponent: function () {
       this.replace(0, 1, [this._createNewComponent()]);
     },
     _createNewComponent: function () {
-      var componentClass = utils.read(this.componentClassStream);
+      var componentName = utils.read(this.componentNameStream);
+      if (!componentName) {
+        return this.createChildView(View['default']);
+      }
+
+      var componentClass = streams__utils.readComponentFactory(componentName, this.container);
       if (!componentClass) {
         throw new EmberError['default']("HTMLBars error: Could not find component named \"" + utils.read(this._boundComponentOptions.componentNameStream) + "\".");
       }
@@ -37472,7 +37618,7 @@ enifed('ember-views/views/bound_component_view', ['exports', 'ember-views/views/
 
       var prop;
       for (prop in hash) {
-        if (prop === "_boundComponentOptions" || prop === "componentClassStream") {
+        if (prop === "_boundComponentOptions" || prop === "componentNameStream") {
           continue;
         }
         hashForComponent[prop] = hash[prop];
@@ -37767,27 +37913,25 @@ enifed('ember-views/views/collection_view', ['exports', 'ember-metal/core', 'emb
 
           view = this.createChildView(itemViewClass, itemViewProps);
 
-          
-            if (this.blockParams > 1) {
-              view._blockArguments = [item, view.getStream("_view.contentIndex")];
-            } else if (this.blockParams === 1) {
-              view._blockArguments = [item];
-            }
-          
+          if (this.blockParams > 0) {
+            view._blockArguments = [item];
+          }
+          if (this.blockParams > 1) {
+            view._blockArguments.push(view.getStream("_view.contentIndex"));
+          }
+
           addedViews.push(view);
         }
 
         this.replace(start, 0, addedViews);
 
-        
-          if (this.blockParams > 1) {
-            var childViews = this._childViews;
-            for (idx = start + added; idx < len; idx++) {
-              view = childViews[idx];
-              property_set.set(view, "contentIndex", idx);
-            }
+        if (this.blockParams > 1) {
+          var childViews = this._childViews;
+          for (idx = start + added; idx < len; idx++) {
+            view = childViews[idx];
+            property_set.set(view, "contentIndex", idx);
           }
-        
+        }
       } else {
         emptyView = property_get.get(this, "emptyView");
 
@@ -37906,19 +38050,18 @@ enifed('ember-views/views/component', ['exports', 'ember-metal/core', 'ember-vie
      @deprecated
     @property template
     */
-    template: computed.computed({
+    template: computed.computed("templateName", {
       get: function () {
         var templateName = property_get.get(this, "templateName");
         var template = this.templateForName(templateName, "template");
 
         Ember['default'].assert("You specified the templateName " + templateName + " for " + this + ", but it did not exist.", !templateName || !!template);
-
         return template || property_get.get(this, "defaultTemplate");
       },
       set: function (key, value) {
         return value;
       }
-    }).property("templateName"),
+    }),
 
     /**
     Specifying a components `templateName` is deprecated without also
@@ -37958,10 +38101,10 @@ enifed('ember-views/views/component', ['exports', 'ember-metal/core', 'ember-vie
       @type Ember.Controller
       @default null
     */
-    targetObject: computed.computed(function (key) {
+    targetObject: computed.computed("_parentView", function (key) {
       var parentView = this._parentView;
       return parentView ? property_get.get(parentView, "controller") : null;
-    }).property("_parentView"),
+    }),
 
     /**
       Triggers a named action on the controller context where the component is used if
@@ -38058,8 +38201,8 @@ enifed('ember-views/views/component', ['exports', 'ember-metal/core', 'ember-vie
     },
 
     send: function (actionName) {
-      for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-        args[_key - 1] = arguments[_key];
+      for (var _len2 = arguments.length, args = Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+        args[_key2 - 1] = arguments[_key2];
       }
 
       var target;
@@ -38743,7 +38886,7 @@ enifed('ember-views/views/metamorph_view', ['exports', 'ember-metal/core', 'embe
   exports._Metamorph = _Metamorph;
 
 });
-enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-views/views/view', 'ember-views/views/collection_view', 'ember-metal/utils', 'ember-metal/is_none', 'ember-metal/computed', 'ember-runtime/system/native_array', 'ember-metal/mixin', 'ember-metal/properties', 'ember-metal/run_loop', 'ember-htmlbars/templates/select'], function (exports, enumerable_utils, property_get, property_set, View, CollectionView, utils, isNone, computed, native_array, mixin, properties, run, htmlbarsTemplate) {
+enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-views/views/view', 'ember-views/views/collection_view', 'ember-metal/utils', 'ember-metal/is_none', 'ember-metal/computed', 'ember-runtime/system/native_array', 'ember-metal/mixin', 'ember-metal/properties', 'ember-htmlbars/templates/select', 'ember-htmlbars/templates/select-option'], function (exports, enumerable_utils, property_get, property_set, View, CollectionView, utils, isNone, computed, native_array, mixin, properties, htmlbarsTemplate, selectOptionDefaultTemplate) {
 
   'use strict';
 
@@ -38754,27 +38897,13 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
 
   var defaultTemplate = htmlbarsTemplate['default'];
 
-  var selectOptionDefaultTemplate = {
-    isHTMLBars: true,
-    revision: "Ember@1.12.0-beta.1",
-    render: function (context, env, contextualElement) {
-      var lazyValue = context.getStream("view.label");
-
-      lazyValue.subscribe(context._wrapAsScheduled(function () {
-        run['default'].scheduleOnce("render", context, "rerender");
-      }));
-
-      return lazyValue.value();
-    }
-  };
-
   var SelectOption = View['default'].extend({
     instrumentDisplay: "Ember.SelectOption",
 
     tagName: "option",
     attributeBindings: ["value", "selected"],
 
-    defaultTemplate: selectOptionDefaultTemplate,
+    defaultTemplate: selectOptionDefaultTemplate['default'],
 
     init: function () {
       this.labelPathDidChange();
@@ -38839,7 +38968,7 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
     Example:
 
     ```javascript
-    App.ApplicationController = Ember.ObjectController.extend({
+    App.ApplicationController = Ember.Controller.extend({
       names: ["Yehuda", "Tom"]
     });
     ```
@@ -38861,7 +38990,7 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
     `value` property:
 
     ```javascript
-    App.ApplicationController = Ember.ObjectController.extend({
+    App.ApplicationController = Ember.Controller.extend({
       selectedName: 'Tom',
       names: ["Yehuda", "Tom"]
     });
@@ -38898,7 +39027,7 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
     element's text. Both paths must reference each object itself as `content`:
 
     ```javascript
-    App.ApplicationController = Ember.ObjectController.extend({
+    App.ApplicationController = Ember.Controller.extend({
       programmers: [
         {firstName: "Yehuda", id: 1},
         {firstName: "Tom",    id: 2}
@@ -38926,7 +39055,7 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
     can be bound to a property on another object:
 
     ```javascript
-    App.ApplicationController = Ember.ObjectController.extend({
+    App.ApplicationController = Ember.Controller.extend({
       programmers: [
         {firstName: "Yehuda", id: 1},
         {firstName: "Tom",    id: 2}
@@ -38969,7 +39098,7 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
     var yehuda = {firstName: "Yehuda", id: 1, bff4eva: 'tom'}
     var tom = {firstName: "Tom", id: 2, bff4eva: 'yehuda'};
 
-    App.ApplicationController = Ember.ObjectController.extend({
+    App.ApplicationController = Ember.Controller.extend({
       selectedPerson: tom,
       programmers: [ yehuda, tom ]
     });
@@ -39003,7 +39132,7 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
     results in there being no `<option>` with a `selected` attribute:
 
     ```javascript
-    App.ApplicationController = Ember.ObjectController.extend({
+    App.ApplicationController = Ember.Controller.extend({
       selectedProgrammer: null,
       programmers: ["Yehuda", "Tom"]
     });
@@ -39032,7 +39161,7 @@ enifed('ember-views/views/select', ['exports', 'ember-metal/enumerable_utils', '
     with the `prompt` option:
 
     ```javascript
-    App.ApplicationController = Ember.ObjectController.extend({
+    App.ApplicationController = Ember.Controller.extend({
       selectedProgrammer: null,
       programmers: [ "Yehuda", "Tom" ]
     });
@@ -39635,14 +39764,8 @@ enifed('ember-views/views/states/has_element', ['exports', 'ember-views/views/st
       if (view._root._morph && !view._elementInserted) {
         throw new EmberError['default']("Something you did caused a view to re-render after it rendered but before it was inserted into the DOM.");
       }
-      // TODO: should be scheduled with renderer
-      run['default'].scheduleOnce("render", function () {
-        if (view.isDestroying) {
-          return;
-        }
 
-        view._renderer.renderTree(view, view._parentView);
-      });
+      run['default'].scheduleOnce("render", view, "_rerender");
     },
 
     // once the view is already in the DOM, destroying it removes it
@@ -39719,12 +39842,12 @@ enifed('ember-views/views/states/in_buffer', ['exports', 'ember-views/views/stat
 
     appendAttr: function (view, attrNode) {
       var buffer = view.buffer;
-      var _childViews = view._childViews;
+      var _attrNodes = view._attrNodes;
 
-      if (!_childViews.length) {
-        _childViews = view._childViews = _childViews.slice();
+      if (!_attrNodes.length) {
+        _attrNodes = view._attrNodes = _attrNodes.slice();
       }
-      _childViews.push(attrNode);
+      _attrNodes.push(attrNode);
 
       if (!attrNode._morph) {
         Ember.assert("bound attributes that do not have a morph must have a buffer", !!buffer);
@@ -39772,12 +39895,12 @@ enifed('ember-views/views/states/in_dom', ['exports', 'ember-metal/platform/crea
     },
 
     appendAttr: function (view, attrNode) {
-      var _childViews = view._childViews;
+      var _attrNodes = view._attrNodes;
 
-      if (!_childViews.length) {
-        _childViews = view._childViews = _childViews.slice();
+      if (!_attrNodes.length) {
+        _attrNodes = view._attrNodes = _attrNodes.slice();
       }
-      _childViews.push(attrNode);
+      _attrNodes.push(attrNode);
 
       attrNode._parentView = view;
       view.renderer.appendAttrTo(attrNode, view.element, attrNode.attrName);
@@ -39969,7 +40092,7 @@ enifed('ember-views/views/text_field', ['exports', 'ember-metal/core', 'ember-me
   });
 
 });
-enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-runtime/mixins/evented', 'ember-runtime/system/object', 'ember-metal/error', 'ember-metal/property_get', 'ember-metal/run_loop', 'ember-metal/observer', 'ember-metal/utils', 'ember-metal/computed', 'ember-metal/mixin', 'ember-metal/deprecate_property', 'ember-metal/property_events', 'ember-views/system/jquery', 'ember-views/system/ext', 'ember-views/views/core_view', 'ember-views/mixins/view_stream_support', 'ember-views/mixins/view_keyword_support', 'ember-views/mixins/view_context_support', 'ember-views/mixins/view_child_views_support', 'ember-views/mixins/view_state_support', 'ember-views/mixins/template_rendering_support', 'ember-views/mixins/class_names_support', 'ember-views/mixins/attribute_bindings_support', 'ember-views/mixins/legacy_view_support', 'ember-views/mixins/instrumentation_support', 'ember-views/mixins/visibility_support'], function (exports, Ember, Evented, EmberObject, EmberError, property_get, run, observer, utils, computed, mixin, deprecate_property, property_events, jQuery, __dep13__, CoreView, ViewStreamSupport, ViewKeywordSupport, ViewContextSupport, ViewChildViewsSupport, ViewStateSupport, TemplateRenderingSupport, ClassNamesSupport, AttributeBindingsSupport, LegacyViewSupport, InstrumentationSupport, VisibilitySupport) {
+enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-runtime/mixins/evented', 'ember-runtime/system/object', 'ember-metal/error', 'ember-metal/property_get', 'ember-metal/run_loop', 'ember-metal/observer', 'ember-metal/utils', 'ember-metal/computed', 'ember-metal/mixin', 'ember-metal/deprecate_property', 'ember-metal/property_events', 'ember-views/system/jquery', 'ember-views/system/ext', 'ember-views/views/core_view', 'ember-views/mixins/view_stream_support', 'ember-views/mixins/view_keyword_support', 'ember-views/mixins/view_context_support', 'ember-views/mixins/view_child_views_support', 'ember-views/mixins/view_state_support', 'ember-views/mixins/template_rendering_support', 'ember-views/mixins/class_names_support', 'ember-views/mixins/attribute_bindings_support', 'ember-views/mixins/legacy_view_support', 'ember-views/mixins/instrumentation_support', 'ember-views/mixins/visibility_support'], function (exports, Ember, Evented, EmberObject, EmberError, property_get, run, ember_metal__observer, utils, computed, mixin, deprecate_property, property_events, jQuery, __dep13__, CoreView, ViewStreamSupport, ViewKeywordSupport, ViewContextSupport, ViewChildViewsSupport, ViewStateSupport, TemplateRenderingSupport, ClassNamesSupport, AttributeBindingsSupport, LegacyViewSupport, InstrumentationSupport, VisibilitySupport) {
 
   'use strict';
 
@@ -40603,6 +40726,14 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-runtime/
     @class View
     @namespace Ember
     @extends Ember.CoreView
+    @uses Ember.ViewContextSupport
+    @uses Ember.ViewChildViewsSupport
+    @uses Ember.TemplateRenderingSupport
+    @uses Ember.ClassNamesSupport
+    @uses Ember.AttributeBindingsSupport
+    @uses Ember.LegacyViewSupport
+    @uses Ember.InstrumentationSupport
+    @uses Ember.VisibilitySupport
   */
   // jscs:disable validateIndentation
   var View = CoreView['default'].extend(ViewStreamSupport['default'], ViewKeywordSupport['default'], ViewContextSupport['default'], ViewChildViewsSupport['default'], ViewStateSupport['default'], TemplateRenderingSupport['default'], ClassNamesSupport['default'], AttributeBindingsSupport['default'], LegacyViewSupport['default'], InstrumentationSupport['default'], VisibilitySupport['default'], {
@@ -40675,15 +40806,21 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-runtime/
       on a subclass.
        @property layout
       @type Function
-    */
-    layout: computed.computed(function (key) {
-      var layoutName = property_get.get(this, "layoutName");
-      var layout = this.templateForName(layoutName, "layout");
+      */
+    layout: computed.computed("layoutName", {
+      get: function (key) {
+        var layoutName = property_get.get(this, "layoutName");
+        var layout = this.templateForName(layoutName, "layout");
 
-      Ember['default'].assert("You specified the layoutName " + layoutName + " for " + this + ", but it did not exist.", !layoutName || !!layout);
+        Ember['default'].assert("You specified the layoutName " + layoutName + " for " + this + ", but it did not exist.", !layoutName || !!layout);
 
-      return layout || property_get.get(this, "defaultLayout");
-    }).property("layoutName"),
+        return layout || property_get.get(this, "defaultLayout");
+      },
+
+      set: function (key, value) {
+        return value;
+      }
+    }),
 
     _yield: function (context, options, morph) {
       var template = property_get.get(this, "template");
@@ -40832,6 +40969,19 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-runtime/
       return this.currentState.rerender(this);
     },
 
+    /*
+     * @private
+     *
+     * @method _rerender
+     */
+    _rerender: function () {
+      if (this.isDestroying || this.isDestroyed) {
+        return;
+      }
+
+      this._renderer.renderTree(this, this._parentView);
+    },
+
     /**
       Given a property name, returns a dasherized version of that
       property name if the property evaluates to a non-falsy value.
@@ -41022,7 +41172,17 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-runtime/
       ```
        If not manually set a default value will be provided by the framework.
        Once rendered an element's `elementId` is considered immutable and you
-      should never change it.
+      should never change it. If you need to compute a dynamic value for the
+      `elementId`, you should do this when the component or element is being
+      instantiated:
+       ```javascript
+        export default Ember.Component.extend({
+          setElementId: function() {
+            var index = this.get('index');
+            this.set('elementId', 'component-id' + index);
+          }.on('init')
+        });
+      ```
        @property elementId
       @type String
     */
@@ -41301,10 +41461,10 @@ enifed('ember-views/views/view', ['exports', 'ember-metal/core', 'ember-runtime/
 
       var scheduledObserver = this._wrapAsScheduled(observer);
 
-      observer.addObserver(root, path, target, scheduledObserver);
+      ember_metal__observer.addObserver(root, path, target, scheduledObserver);
 
       this.one("willClearRender", function () {
-        observer.removeObserver(root, path, target, scheduledObserver);
+        ember_metal__observer.removeObserver(root, path, target, scheduledObserver);
       });
     },