ember-source 1.10.0.beta.1 → 1.10.0.beta.2

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.10.0-beta.1
+ * @version   1.10.0-beta.2
  */
 
 (function() {
@@ -4207,7 +4207,7 @@ enifed("ember-extension-support/container_debug_adapter",
 
       @class ContainerDebugAdapter
       @namespace Ember
-      @extends EmberObject
+      @extends Ember.Object
       @since 1.5.0
     */
     __exports__["default"] = EmberObject.extend({
@@ -4769,47 +4769,51 @@ enifed("ember-extension-support/data_adapter",
     });
   });
 enifed("ember-htmlbars",
-  ["ember-metal/core","ember-htmlbars/hooks/content","ember-htmlbars/hooks/component","ember-htmlbars/hooks/element","ember-htmlbars/hooks/subexpr","ember-htmlbars/hooks/attribute","ember-htmlbars/hooks/concat","ember-htmlbars/hooks/get","ember-htmlbars/hooks/set","morph","ember-htmlbars/system/template","ember-htmlbars/system/compile","ember-htmlbars/system/make-view-helper","ember-htmlbars/system/make_bound_helper","ember-htmlbars/helpers","ember-htmlbars/helpers/binding","ember-htmlbars/helpers/view","ember-htmlbars/helpers/yield","ember-htmlbars/helpers/with","ember-htmlbars/helpers/log","ember-htmlbars/helpers/debugger","ember-htmlbars/helpers/bind-attr","ember-htmlbars/helpers/if_unless","ember-htmlbars/helpers/loc","ember-htmlbars/helpers/partial","ember-htmlbars/helpers/template","ember-htmlbars/helpers/input","ember-htmlbars/helpers/text_area","ember-htmlbars/helpers/collection","ember-htmlbars/helpers/each","ember-htmlbars/helpers/unbound","ember-htmlbars/system/bootstrap","ember-htmlbars/compat","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __exports__) {
+  ["ember-metal/core","ember-template-compiler","ember-htmlbars/hooks/content","ember-htmlbars/hooks/component","ember-htmlbars/hooks/element","ember-htmlbars/hooks/subexpr","ember-htmlbars/hooks/attribute","ember-htmlbars/hooks/concat","ember-htmlbars/hooks/get","ember-htmlbars/hooks/set","morph","ember-htmlbars/system/make-view-helper","ember-htmlbars/system/make_bound_helper","ember-htmlbars/helpers","ember-htmlbars/helpers/binding","ember-htmlbars/helpers/view","ember-htmlbars/helpers/yield","ember-htmlbars/helpers/with","ember-htmlbars/helpers/log","ember-htmlbars/helpers/debugger","ember-htmlbars/helpers/bind-attr","ember-htmlbars/helpers/if_unless","ember-htmlbars/helpers/loc","ember-htmlbars/helpers/partial","ember-htmlbars/helpers/template","ember-htmlbars/helpers/input","ember-htmlbars/helpers/text_area","ember-htmlbars/helpers/collection","ember-htmlbars/helpers/each","ember-htmlbars/helpers/unbound","ember-htmlbars/system/bootstrap","ember-htmlbars/compat","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
-    var content = __dependency2__["default"];
-    var component = __dependency3__["default"];
-    var element = __dependency4__["default"];
-    var subexpr = __dependency5__["default"];
-    var attribute = __dependency6__["default"];
-    var concat = __dependency7__["default"];
-    var get = __dependency8__["default"];
-    var set = __dependency9__["default"];
-    var DOMHelper = __dependency10__.DOMHelper;
-    var template = __dependency11__["default"];
-    var compile = __dependency12__["default"];
-    var makeViewHelper = __dependency13__["default"];
-    var makeBoundHelper = __dependency14__["default"];
-
-    var registerHelper = __dependency15__.registerHelper;
-    var helper = __dependency15__.helper;
-    var helpers = __dependency15__["default"];
-    var bindHelper = __dependency16__.bindHelper;
-    var viewHelper = __dependency17__.viewHelper;
-    var yieldHelper = __dependency18__.yieldHelper;
-    var withHelper = __dependency19__.withHelper;
-    var logHelper = __dependency20__.logHelper;
-    var debuggerHelper = __dependency21__.debuggerHelper;
-    var bindAttrHelper = __dependency22__.bindAttrHelper;
-    var bindAttrHelperDeprecated = __dependency22__.bindAttrHelperDeprecated;
-    var ifHelper = __dependency23__.ifHelper;
-    var unlessHelper = __dependency23__.unlessHelper;
-    var unboundIfHelper = __dependency23__.unboundIfHelper;
-    var boundIfHelper = __dependency23__.boundIfHelper;
-    var locHelper = __dependency24__.locHelper;
-    var partialHelper = __dependency25__.partialHelper;
-    var templateHelper = __dependency26__.templateHelper;
-    var inputHelper = __dependency27__.inputHelper;
-    var textareaHelper = __dependency28__.textareaHelper;
-    var collectionHelper = __dependency29__.collectionHelper;
-    var eachHelper = __dependency30__.eachHelper;
-    var unboundHelper = __dependency31__.unboundHelper;
+
+    var precompile = __dependency2__.precompile;
+    var compile = __dependency2__.compile;
+    var template = __dependency2__.template;
+    var registerPlugin = __dependency2__.registerPlugin;
+
+    var content = __dependency3__["default"];
+    var component = __dependency4__["default"];
+    var element = __dependency5__["default"];
+    var subexpr = __dependency6__["default"];
+    var attribute = __dependency7__["default"];
+    var concat = __dependency8__["default"];
+    var get = __dependency9__["default"];
+    var set = __dependency10__["default"];
+    var DOMHelper = __dependency11__.DOMHelper;
+    var makeViewHelper = __dependency12__["default"];
+    var makeBoundHelper = __dependency13__["default"];
+
+    var registerHelper = __dependency14__.registerHelper;
+    var helper = __dependency14__.helper;
+    var helpers = __dependency14__["default"];
+    var bindHelper = __dependency15__.bindHelper;
+    var viewHelper = __dependency16__.viewHelper;
+    var yieldHelper = __dependency17__.yieldHelper;
+    var withHelper = __dependency18__.withHelper;
+    var logHelper = __dependency19__.logHelper;
+    var debuggerHelper = __dependency20__.debuggerHelper;
+    var bindAttrHelper = __dependency21__.bindAttrHelper;
+    var bindAttrHelperDeprecated = __dependency21__.bindAttrHelperDeprecated;
+    var ifHelper = __dependency22__.ifHelper;
+    var unlessHelper = __dependency22__.unlessHelper;
+    var unboundIfHelper = __dependency22__.unboundIfHelper;
+    var boundIfHelper = __dependency22__.boundIfHelper;
+    var locHelper = __dependency23__.locHelper;
+    var partialHelper = __dependency24__.partialHelper;
+    var templateHelper = __dependency25__.templateHelper;
+    var inputHelper = __dependency26__.inputHelper;
+    var textareaHelper = __dependency27__.textareaHelper;
+    var collectionHelper = __dependency28__.collectionHelper;
+    var eachHelper = __dependency29__.eachHelper;
+    var unboundHelper = __dependency30__.unboundHelper;
 
     // importing adds template bootstrapping
     // initializer to enable embedded templates
@@ -4847,8 +4851,10 @@ enifed("ember-htmlbars",
         _registerHelper: registerHelper,
         template: template,
         compile: compile,
+        precompile: precompile,
         makeViewHelper: makeViewHelper,
-        makeBoundHelper: makeBoundHelper
+        makeBoundHelper: makeBoundHelper,
+        registerPlugin: registerPlugin
       };
 
     
@@ -4872,8 +4878,8 @@ enifed("ember-htmlbars",
     __exports__.defaultEnv = defaultEnv;
   });
 enifed("ember-htmlbars/attr_nodes",
-  ["ember-htmlbars/attr_nodes/quoted","ember-htmlbars/attr_nodes/unquoted","ember-htmlbars/attr_nodes/unquoted_nonproperty","ember-htmlbars/attr_nodes/quoted_class","ember-metal/platform","ember-htmlbars/attr_nodes/utils","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+  ["ember-htmlbars/attr_nodes/quoted","ember-htmlbars/attr_nodes/unquoted","ember-htmlbars/attr_nodes/unquoted_nonproperty","ember-views/system/sanitize_attribute_value","ember-htmlbars/attr_nodes/sanitized","ember-metal/platform","ember-htmlbars/attr_nodes/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -4883,9 +4889,10 @@ enifed("ember-htmlbars/attr_nodes",
     var QuotedAttrNode = __dependency1__["default"];
     var UnquotedAttrNode = __dependency2__["default"];
     var UnquotedNonpropertyAttrNode = __dependency3__["default"];
-    var QuotedClassAttrNode = __dependency4__["default"];
-    var o_create = __dependency5__.create;
-    var normalizeProperty = __dependency6__.normalizeProperty;
+    var badAttributes = __dependency4__.badAttributes;
+    var SanitizedAttrNode = __dependency5__["default"];
+    var o_create = __dependency6__.create;
+    var normalizeProperty = __dependency7__.normalizeProperty;
 
     var svgNamespaceURI = 'http://www.w3.org/2000/svg';
 
@@ -4893,7 +4900,11 @@ enifed("ember-htmlbars/attr_nodes",
     unquotedAttrNodeTypes['class'] = UnquotedNonpropertyAttrNode;
 
     var quotedAttrNodeTypes = o_create(null);
-    quotedAttrNodeTypes['class'] = QuotedClassAttrNode;
+
+    for (var attrName in badAttributes) {
+      unquotedAttrNodeTypes[attrName] = SanitizedAttrNode;
+      quotedAttrNodeTypes[attrName] = SanitizedAttrNode;
+    }
 
     __exports__["default"] = function attrNodeTypeFor(attrName, element, quoted) {
       var result;
@@ -4994,7 +5005,7 @@ enifed("ember-htmlbars/attr_nodes/quoted",
 
     function QuotedAttrNode(element, attrName, attrValue, dom) {
       this.init(element, attrName, attrValue, dom);
-    } 
+    }
 
     QuotedAttrNode.prototype = o_create(SimpleAttrNode.prototype);
 
@@ -5004,118 +5015,35 @@ enifed("ember-htmlbars/attr_nodes/quoted",
 
     __exports__["default"] = QuotedAttrNode;
   });
-enifed("ember-htmlbars/attr_nodes/quoted_class",
-  ["ember-metal/run_loop","ember-metal/streams/utils","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("ember-htmlbars/attr_nodes/sanitized",
+  ["./simple","ember-metal/platform","ember-metal/streams/utils","ember-views/system/sanitize_attribute_value","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-htmlbars
     */
 
-    var run = __dependency1__["default"];
-    var read = __dependency2__.read;
-    var subscribe = __dependency2__.subscribe;
-
-    var SPACES = /\s+/;
-    var ADD_LIST = [];
-    var REMOVE_LIST = [];
-
-    // Dedupes and removes empty strings. It expects the array
-    // to be sorted.
-    // TODO: This could be done in-place instead of splicing.
-    function normalizeClasses(array) {
-      var i = 0;
-      while (i < array.length - 1) {
-        if (array[i] === array[i+1]) {
-          array.splice(i, 1);
-        } else {
-          i++;
-        }
-      }
-      if (array[0] === '') {
-        array.shift();
-      }
-    }
-
-    function buildClasses(value) {
-      if (typeof value === 'string') {
-        return value.split(SPACES);
-      } else {
-        return [];
-      }
-    }
+    var SimpleAttrNode = __dependency1__["default"];
+    var o_create = __dependency2__.create;
+    var chainStream = __dependency3__.chainStream;
+    var read = __dependency3__.read;
+    var sanitizeAttributeValue = __dependency4__["default"];
 
-    function QuotedClassAttrNode(element, attrName, attrValue, dom) {
-      this.element = element;
-      this.attrName = attrName;
-      this.dom = dom;
-      this.isDirty = false;
+    function SanitizedAttrNode(element, attrName, attrValue, dom) {
+      var sanitizedValue = chainStream(attrValue, function(){
+        var unsafeValue = read(attrValue);
+        var safeValue = sanitizeAttributeValue(element, attrName, unsafeValue);
 
-      this.classes = attrValue;
-      this.oldClasses = [];
+        return safeValue;
+      });
 
-      subscribe(attrValue, this.renderIfNeeded, this);
-      this.renderIfNeeded();
+      this.init(element, attrName, sanitizedValue, dom);
     }
 
-    QuotedClassAttrNode.prototype.renderIfNeeded = function renderIfNeeded(){
-      this.isDirty = true;
-      run.schedule('render', this, this.scheduledRenderIfNeeded);
-    };
-
-    QuotedClassAttrNode.prototype.scheduledRenderIfNeeded = function scheduledRenderIfNeeded(){
-      if (this.isDirty) {
-        this.isDirty = false;
-        this.render();
-      }
-    };
-
-    QuotedClassAttrNode.prototype.render = function render(){
-      ADD_LIST.length = 0;
-      REMOVE_LIST.length = 0;
-
-      var oldClasses = this.oldClasses;
-      var newClasses = buildClasses(read(this.classes));
-      newClasses.sort();
-      normalizeClasses(newClasses);
-
-      var oldIndex = 0;
-      var oldLength = oldClasses.length;
-      var newIndex = 0;
-      var newLength = newClasses.length;
-
-      while (oldIndex < oldLength || newIndex < newLength) {
-        var oldClass = oldClasses[oldIndex];
-        var newClass = newClasses[newIndex];
-
-        if (oldIndex === oldLength) {
-          ADD_LIST.push(newClass);
-          newIndex++;
-        } else if (newIndex === newLength) {
-          REMOVE_LIST.push(oldClass);
-          oldIndex++;
-        } else {
-          if (oldClass === newClass) {
-            oldIndex++;
-            newIndex++;
-          } else if (oldClass < newClass) {
-            REMOVE_LIST.push(oldClass);
-            oldIndex++;
-          } else {
-            ADD_LIST.push(newClass);
-            newIndex++;
-          }
-        }
-      }
-
-      this.oldClasses = newClasses;
-
-      this.dom.addClasses(this.element, ADD_LIST);
-      this.dom.removeClasses(this.element, REMOVE_LIST);
-    };
+    SanitizedAttrNode.prototype = o_create(SimpleAttrNode.prototype);
 
-    __exports__["default"] = QuotedClassAttrNode;
+    __exports__["default"] = SanitizedAttrNode;
   });
 enifed("ember-htmlbars/attr_nodes/simple",
   ["ember-metal/run_loop","exports"],
@@ -5130,32 +5058,32 @@ enifed("ember-htmlbars/attr_nodes/simple",
 
     function SimpleAttrNode() {
       // abstract class
-    } 
+    }
 
     SimpleAttrNode.prototype.init = function init(element, attrName, simpleAttrValue, dom){
       this.element = element;
       this.attrName = attrName;
       this.attrValue = simpleAttrValue;
       this.dom = dom;
-      this.isDirty = false;
+      this.isDirty = true;
       this.lastValue = null;
       this.currentValue = null;
 
       if (this.attrValue.isStream) {
-        this.attrValue.subscribe(this.renderIfNeeded, this);
-        this.renderIfNeeded();
+        this.attrValue.subscribe(this.markDirty, this);
+        this.renderIfDirty();
       } else {
         this.currentValue = simpleAttrValue;
         this.render();
       }
     };
 
-    SimpleAttrNode.prototype.renderIfNeeded = function renderIfNeeded(){
+    SimpleAttrNode.prototype.markDirty = function markDirty(){
       this.isDirty = true;
-      run.schedule('render', this, this.scheduledRenderIfNeeded);
+      run.schedule('render', this, this.renderIfDirty);
     };
 
-    SimpleAttrNode.prototype.scheduledRenderIfNeeded = function scheduledRenderIfNeeded(){
+    SimpleAttrNode.prototype.renderIfDirty = function renderIfDirty(){
       if (this.isDirty) {
         this.isDirty = false;
         var value = this.attrValue.value();
@@ -5189,7 +5117,7 @@ enifed("ember-htmlbars/attr_nodes/unquoted",
     function UnquotedAttrNode(element, attrName, attrValue, dom) {
       var normalizedAttrName = normalizeProperty(element, attrName) || attrName;
       this.init(element, normalizedAttrName, attrValue, dom);
-    } 
+    }
 
     UnquotedAttrNode.prototype = o_create(SimpleAttrNode.prototype);
 
@@ -5209,7 +5137,7 @@ enifed("ember-htmlbars/attr_nodes/unquoted_nonproperty",
 
     function UnquotedNonpropertyAttrNode(element, attrName, attrValue, dom) {
       this.init(element, attrName, attrValue, dom);
-    } 
+    }
 
     UnquotedNonpropertyAttrNode.prototype = o_create(SimpleAttrNode.prototype);
 
@@ -5252,20 +5180,22 @@ enifed("ember-htmlbars/attr_nodes/utils",
     __exports__.normalizeProperty = normalizeProperty;
   });
 enifed("ember-htmlbars/compat",
-  ["ember-metal/core","ember-htmlbars/helpers","ember-htmlbars/system/template","ember-htmlbars/system/compile","ember-htmlbars/compat/helper","ember-htmlbars/compat/handlebars-get","ember-htmlbars/compat/make-bound-helper","ember-htmlbars/compat/register-bound-helper","ember-htmlbars/compat/precompile","ember-htmlbars/system/make-view-helper","exports"],
+  ["ember-metal/core","ember-htmlbars/helpers","ember-template-compiler","ember-htmlbars/compat/helper","ember-htmlbars/compat/handlebars-get","ember-htmlbars/compat/make-bound-helper","ember-htmlbars/compat/register-bound-helper","ember-htmlbars/compat/precompile","ember-htmlbars/system/make-view-helper","ember-htmlbars/utils/string","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var helpers = __dependency2__["default"];
-    var template = __dependency3__["default"];
-    var compile = __dependency4__["default"];
-    var compatRegisterHelper = __dependency5__.registerHandlebarsCompatibleHelper;
-    var compatHandlebarsHelper = __dependency5__.handlebarsHelper;
-    var compatHandlebarsGet = __dependency6__["default"];
-    var compatMakeBoundHelper = __dependency7__["default"];
-    var compatRegisterBoundHelper = __dependency8__["default"];
-    var compatPrecompile = __dependency9__["default"];
-    var makeViewHelper = __dependency10__["default"];
+    var template = __dependency3__.template;
+    var compile = __dependency3__.compile;
+    var compatRegisterHelper = __dependency4__.registerHandlebarsCompatibleHelper;
+    var compatHandlebarsHelper = __dependency4__.handlebarsHelper;
+    var compatHandlebarsGet = __dependency5__["default"];
+    var compatMakeBoundHelper = __dependency6__["default"];
+    var compatRegisterBoundHelper = __dependency7__["default"];
+    var compatPrecompile = __dependency8__["default"];
+    var makeViewHelper = __dependency9__["default"];
+    var SafeString = __dependency10__.SafeString;
+    var escapeExpression = __dependency10__.escapeExpression;
 
     var EmberHandlebars;
     
@@ -5280,6 +5210,11 @@ enifed("ember-htmlbars/compat",
       EmberHandlebars.compile = compile;
       EmberHandlebars.template = template;
       EmberHandlebars.makeViewHelper = makeViewHelper;
+
+      EmberHandlebars.SafeString = SafeString;
+      EmberHandlebars.Utils =  {
+        escapeExpression: escapeExpression
+      };
     
 
     __exports__["default"] = EmberHandlebars;
@@ -5312,8 +5247,8 @@ enifed("ember-htmlbars/compat/handlebars-get",
     }
   });
 enifed("ember-htmlbars/compat/helper",
-  ["ember-metal/merge","ember-htmlbars/helpers","ember-views/views/view","ember-views/views/component","ember-htmlbars/system/make-view-helper","ember-htmlbars/compat/make-bound-helper","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+  ["ember-metal/merge","ember-htmlbars/helpers","ember-views/views/view","ember-views/views/component","ember-htmlbars/system/make-view-helper","ember-htmlbars/compat/make-bound-helper","ember-metal/streams/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -5326,6 +5261,7 @@ enifed("ember-htmlbars/compat/helper",
     var Component = __dependency4__["default"];
     var makeViewHelper = __dependency5__["default"];
     var makeBoundHelper = __dependency6__["default"];
+    var isStream = __dependency7__.isStream;
 
     var slice = [].slice;
 
@@ -5347,7 +5283,7 @@ enifed("ember-htmlbars/compat/helper",
         for (var prop in hash) {
           param = hash[prop];
 
-          if (param.isStream) {
+          if (isStream(param)) {
             handlebarsOptions.hash[prop] = param._label;
           } else {
             handlebarsOptions.hash[prop] = param;
@@ -5358,7 +5294,7 @@ enifed("ember-htmlbars/compat/helper",
         for (var i = 0, l = params.length; i < l; i++) {
           param = params[i];
 
-          if (param.isStream) {
+          if (isStream(param)) {
             args[i] = param._label;
           } else {
             args[i] = param;
@@ -5397,8 +5333,8 @@ enifed("ember-htmlbars/compat/helper",
     __exports__.handlebarsHelper = handlebarsHelper;__exports__["default"] = HandlebarsCompatibleHelper;
   });
 enifed("ember-htmlbars/compat/make-bound-helper",
-  ["ember-metal/core","ember-metal/mixin","ember-views/views/simple_bound_view","ember-htmlbars/system/helper","ember-metal/streams/stream","ember-metal/streams/utils","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+  ["ember-metal/core","ember-metal/mixin","ember-htmlbars/system/helper","ember-metal/streams/stream","ember-metal/streams/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -5408,12 +5344,14 @@ enifed("ember-htmlbars/compat/make-bound-helper",
     var Ember = __dependency1__["default"];
     // Ember.FEATURES, Ember.assert, Ember.Handlebars, Ember.lookup
     var IS_BINDING = __dependency2__.IS_BINDING;
-    var appendSimpleBoundView = __dependency3__.appendSimpleBoundView;
-    var Helper = __dependency4__["default"];
+    var Helper = __dependency3__["default"];
 
-    var Stream = __dependency5__["default"];
-    var readArray = __dependency6__.readArray;
-    var readHash = __dependency6__.readHash;
+    var Stream = __dependency4__["default"];
+    var readArray = __dependency5__.readArray;
+    var scanArray = __dependency5__.scanArray;
+    var scanHash = __dependency5__.scanHash;
+    var readHash = __dependency5__.readHash;
+    var isStream = __dependency5__.isStream;
 
     /**
       A helper function used by `registerBoundHelper`. Takes the
@@ -5450,6 +5388,7 @@ enifed("ember-htmlbars/compat/make-bound-helper",
       function helperFunc(params, hash, options, env) {
         var view = this;
         var numParams = params.length;
+        var param;
 
         Ember.assert("registerBoundHelper-generated helpers do not support use with Handlebars blocks.", !options.template);
 
@@ -5466,7 +5405,7 @@ enifed("ember-htmlbars/compat/make-bound-helper",
           for (var i = 0, l = params.length; i < l; i++) {
             param = params[i];
 
-            if (param.isStream) {
+            if (isStream(param)) {
               properties[i] = param._label;
             } else {
               properties[i] = param;
@@ -5480,25 +5419,25 @@ enifed("ember-htmlbars/compat/make-bound-helper",
           return fn.apply(view, args);
         }
 
-        if (env.data.isUnbound) {
+        // If none of the hash parameters are bound, act as an unbound helper.
+        // This prevents views from being unnecessarily created
+        var hasStream = scanArray(params) || scanHash(hash);
+
+        if (env.data.isUnbound || !hasStream){
           return valueFn();
         } else {
           var lazyValue = new Stream(valueFn);
 
-          appendSimpleBoundView(this, options.morph, lazyValue);
-
-          var param;
-
           for (i = 0; i < numParams; i++) {
             param = params[i];
-            if (param && param.isStream) {
+            if (isStream(param)) {
               param.subscribe(lazyValue.notify, lazyValue);
             }
           }
 
           for (prop in hash) {
             param = hash[prop];
-            if (param && param.isStream) {
+            if (isStream(param)) {
               param.subscribe(lazyValue.notify, lazyValue);
             }
           }
@@ -5507,7 +5446,7 @@ enifed("ember-htmlbars/compat/make-bound-helper",
             var firstParam = params[0];
             // Only bother with subscriptions if the first argument
             // is a stream itself, and not a primitive.
-            if (firstParam && firstParam.isStream) {
+            if (isStream(firstParam)) {
               var onDependentKeyNotify = function onDependentKeyNotify(stream) {
                 stream.value();
                 lazyValue.notify();
@@ -5519,6 +5458,8 @@ enifed("ember-htmlbars/compat/make-bound-helper",
               }
             }
           }
+
+          return lazyValue;
         }
       }
 
@@ -5675,30 +5616,32 @@ enifed("ember-htmlbars/compat/register-bound-helper",
     }
   });
 enifed("ember-htmlbars/helpers",
-  ["ember-views/views/view","ember-views/views/component","ember-htmlbars/system/make-view-helper","ember-htmlbars/system/helper","ember-htmlbars/system/make_bound_helper","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+  ["ember-metal/platform","ember-views/views/view","ember-views/views/component","ember-htmlbars/system/make-view-helper","ember-htmlbars/system/helper","ember-htmlbars/system/make_bound_helper","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-htmlbars
     */
 
+    var o_create = __dependency1__.create;
+
     /**
      @private
      @property helpers
     */
-    var helpers = { };
+    var helpers = o_create(null);
 
     /**
     @module ember
     @submodule ember-htmlbars
     */
 
-    var View = __dependency1__["default"];
-    var Component = __dependency2__["default"];
-    var makeViewHelper = __dependency3__["default"];
-    var Helper = __dependency4__["default"];
-    var makeBoundHelper = __dependency5__["default"];
+    var View = __dependency2__["default"];
+    var Component = __dependency3__["default"];
+    var makeViewHelper = __dependency4__["default"];
+    var Helper = __dependency5__["default"];
+    var makeBoundHelper = __dependency6__["default"];
 
     /**
       Register a bound helper or custom view helper.
@@ -5876,8 +5819,8 @@ enifed("ember-htmlbars/helpers",
     __exports__.registerBoundHelper = registerBoundHelper;__exports__["default"] = helpers;
   });
 enifed("ember-htmlbars/helpers/bind-attr",
-  ["ember-metal/core","ember-runtime/system/string","ember-htmlbars/attr_nodes/quoted_class","ember-htmlbars/attr_nodes/legacy_bind","ember-views/views/view","ember-metal/streams/stream","ember-metal/keys","ember-htmlbars/helpers","ember-htmlbars/hooks/concat","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+  ["ember-metal/core","ember-runtime/system/string","ember-htmlbars/attr_nodes/quoted","ember-htmlbars/attr_nodes/legacy_bind","ember-views/system/sanitize_attribute_value","ember-htmlbars/attr_nodes/sanitized","ember-metal/keys","ember-htmlbars/helpers","ember-metal/enumerable_utils","ember-metal/streams/utils","ember-views/streams/class_name_binding","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -5888,13 +5831,16 @@ enifed("ember-htmlbars/helpers/bind-attr",
     // Ember.assert
 
     var fmt = __dependency2__.fmt;
-    var QuotedClassAttrNode = __dependency3__["default"];
+    var QuotedAttrNode = __dependency3__["default"];
     var LegacyBindAttrNode = __dependency4__["default"];
-    var View = __dependency5__["default"];
-    var Stream = __dependency6__["default"];
+    var badAttributes = __dependency5__.badAttributes;
+    var SanitizedAttrNode = __dependency6__["default"];
     var keys = __dependency7__["default"];
     var helpers = __dependency8__["default"];
-    var concat = __dependency9__["default"];
+    var map = __dependency9__.map;
+    var isStream = __dependency10__.isStream;
+    var concat = __dependency10__.concat;
+    var streamifyClassNameBinding = __dependency11__.streamifyClassNameBinding;
 
     /**
       `bind-attr` allows you to create a binding between DOM element attributes and
@@ -6027,10 +5973,14 @@ enifed("ember-htmlbars/helpers/bind-attr",
       var view = this;
 
       // Handle classes differently, as we can bind multiple classes
-      var classBindings = hash['class'];
-      if (classBindings != null) {
-        var attrValue = streamifyClassBindings(view, classBindings);
-        new QuotedClassAttrNode(element, 'class', attrValue, env.dom);
+      var classNameBindings = hash['class'];
+      if (classNameBindings !== null && classNameBindings !== undefined) {
+        if (isStream(classNameBindings)) {
+          new QuotedAttrNode(element, 'class', classNameBindings, env.dom);
+        } else {
+          var classNameBindingsStream = applyClassNameBindings(classNameBindings, view);
+          new QuotedAttrNode(element, 'class', classNameBindingsStream, env.dom);
+        }
         delete hash['class'];
       }
 
@@ -6040,7 +5990,7 @@ enifed("ember-htmlbars/helpers/bind-attr",
       for (var i=0, l=attrKeys.length;i<l;i++) {
         attr = attrKeys[i];
         path = hash[attr];
-        if (path.isStream) {
+        if (isStream(path)) {
           lazyValue = path;
         } else {
           Ember.assert(
@@ -6050,10 +6000,23 @@ enifed("ember-htmlbars/helpers/bind-attr",
           );
           lazyValue = view.getStream(path);
         }
-        new LegacyBindAttrNode(element, attr, lazyValue, env.dom);
+        if (badAttributes[attr]) {
+          new SanitizedAttrNode(element, attr, lazyValue, env.dom);
+        } else {
+          new LegacyBindAttrNode(element, attr, lazyValue, env.dom);
+        }
       }
     }
 
+    function applyClassNameBindings(classNameBindings, view) {
+      var arrayOfClassNameBindings = classNameBindings.split(' ');
+      var boundClassNameBindings = map(arrayOfClassNameBindings, function(classNameBinding) {
+        return streamifyClassNameBinding(view, classNameBinding);
+      });
+      var concatenatedClassNames = concat(boundClassNameBindings, ' ');
+      return concatenatedClassNames;
+    }
+
     /**
       See `bind-attr`
 
@@ -6070,65 +6033,13 @@ enifed("ember-htmlbars/helpers/bind-attr",
       return helpers['bind-attr'].apply(this, arguments);
     }
 
-    /**
-      Helper that, given a space-separated string of property paths and a context,
-      returns an array of class names. Calling this method also has the side
-      effect of setting up observers at those property paths, such that if they
-      change, the correct class name will be reapplied to the DOM element.
-
-      For example, if you pass the string "fooBar", it will first look up the
-      "fooBar" value of the context. If that value is true, it will add the
-      "foo-bar" class to the current element (i.e., the dasherized form of
-      "fooBar"). If the value is a string, it will add that string as the class.
-      Otherwise, it will not add any new class name.
-
-      @private
-      @method bindClasses
-      @for Ember.Handlebars
-      @param {String} classBindings A string, space-separated, of class bindings
-        to use
-      @param {View} view The view in which observers should look for the
-        element to update
-      @return {Array} An array of class names to add
-    */
-    function streamifyClassBindings(view, classBindingsString) {
-      var classBindings = classBindingsString.split(' ');
-      var streamified = [];
-
-      var parsedPath;
-      for (var i=0, l=classBindings.length;i<l;i++) {
-        parsedPath = View._parsePropertyPath(classBindings[i]);
-
-        if (parsedPath.path === '') {
-          streamified.push(classStringForParsedPath(parsedPath, true) + " ");
-        } else {
-          (function(){
-            var lazyValue = view.getStream(parsedPath.path);
-            var _parsedPath = parsedPath;
-            var classNameBound = new Stream(function(){
-              var value = lazyValue.value();
-              return classStringForParsedPath(_parsedPath, value) + " ";
-            });
-            lazyValue.subscribe(classNameBound.notify, classNameBound);
-            streamified.push(classNameBound);
-          })(); // jshint ignore:line
-        }
-      }
-
-      return concat(streamified);
-    }
-
-    function classStringForParsedPath(parsedPath, value) {
-      return View._classStringForValue(parsedPath.path, value, parsedPath.className, parsedPath.falsyClassName);
-    }
-
     __exports__["default"] = bindAttrHelper;
 
     __exports__.bindAttrHelper = bindAttrHelper;
     __exports__.bindAttrHelperDeprecated = bindAttrHelperDeprecated;
   });
 enifed("ember-htmlbars/helpers/binding",
-  ["ember-metal/is_none","ember-metal/run_loop","ember-metal/property_get","ember-metal/streams/simple","ember-views/views/bound_view","ember-views/views/simple_bound_view","exports"],
+  ["ember-metal/is_none","ember-metal/run_loop","ember-metal/property_get","ember-metal/streams/simple","ember-views/views/bound_view","ember-metal/streams/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
     /**
@@ -6141,7 +6052,7 @@ enifed("ember-htmlbars/helpers/binding",
     var get = __dependency3__.get;
     var SimpleStream = __dependency4__["default"];
     var BoundView = __dependency5__["default"];
-    var appendSimpleBoundView = __dependency6__.appendSimpleBoundView;
+    var isStream = __dependency6__.isStream;
 
     function exists(value) {
       return !isNone(value);
@@ -6150,7 +6061,7 @@ enifed("ember-htmlbars/helpers/binding",
     // Binds a property into the DOM. This will create a hook in DOM that the
     // KVO system will look for and update if the property changes.
     function bind(property, hash, options, env, preserveContext, shouldDisplay, valueNormalizer, childProperties, _viewClass) {
-      var valueStream = property.isStream ? property : this.getStream(property);
+      var valueStream = isStream(property) ? property : this.getStream(property);
       var lazyValue;
 
       if (childProperties) {
@@ -6239,7 +6150,7 @@ enifed("ember-htmlbars/helpers/binding",
         Ember.deprecate("The block form of bind, {{#bind foo}}{{/bind}}, has been deprecated and will be removed.");
         bind.call(this, property, hash, options, env, false, exists);
       } else {
-        appendSimpleBoundView(this, options.morph, property);
+        return property;
       }
     }
 
@@ -6247,8 +6158,8 @@ enifed("ember-htmlbars/helpers/binding",
     __exports__.bindHelper = bindHelper;
   });
 enifed("ember-htmlbars/helpers/collection",
-  ["ember-metal/core","ember-metal/mixin","ember-runtime/system/string","ember-metal/property_get","ember-metal/streams/simple","ember-htmlbars/helpers/view","ember-views/views/view","ember-views/views/collection_view","ember-views/streams/utils","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+  ["ember-metal/core","ember-metal/mixin","ember-runtime/system/string","ember-metal/property_get","ember-htmlbars/helpers/view","ember-views/views/collection_view","ember-views/streams/utils","ember-metal/enumerable_utils","ember-views/streams/class_name_binding","ember-metal/binding","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -6260,11 +6171,12 @@ enifed("ember-htmlbars/helpers/collection",
     var IS_BINDING = __dependency2__.IS_BINDING;
     var fmt = __dependency3__.fmt;
     var get = __dependency4__.get;
-    var SimpleStream = __dependency5__["default"];
-    var ViewHelper = __dependency6__.ViewHelper;
-    var View = __dependency7__["default"];
-    var CollectionView = __dependency8__["default"];
-    var readViewFactory = __dependency9__.readViewFactory;
+    var ViewHelper = __dependency5__.ViewHelper;
+    var CollectionView = __dependency6__["default"];
+    var readViewFactory = __dependency7__.readViewFactory;
+    var map = __dependency8__.map;
+    var streamifyClassNameBinding = __dependency9__.streamifyClassNameBinding;
+    var Binding = __dependency10__.Binding;
 
     /**
       `{{collection}}` is a `Ember.Handlebars` helper for adding instances of
@@ -6406,7 +6318,8 @@ enifed("ember-htmlbars/helpers/collection",
           view      = data.view,
           // This should be deterministic, and should probably come from a
           // parent view and not the controller.
-          container = (view.controller && view.controller.container ? view.controller.container : view.container);
+          controller = get(view, 'controller'),
+          container = (controller && controller.container ? controller.container : view.container);
 
       // If passed a path string, convert that into an object.
       // Otherwise, just default to the standard class.
@@ -6482,27 +6395,18 @@ enifed("ember-htmlbars/helpers/collection",
       if (emptyViewClass) { hash.emptyView = emptyViewClass; }
 
       if (hash.keyword) {
-        itemHash._contextBinding = '_parentView.context';
+        itemHash._contextBinding = Binding.oneWay('_parentView.context');
       } else {
-        itemHash._contextBinding = 'content';
+        itemHash._contextBinding = Binding.oneWay('content');
       }
 
       var viewOptions = ViewHelper.propertiesFromHTMLOptions(itemHash, {}, { data: data });
 
       if (hash.itemClassBinding) {
         var itemClassBindings = hash.itemClassBinding.split(' ');
-
-        for (var i = 0; i < itemClassBindings.length; i++) {
-          var parsedPath = View._parsePropertyPath(itemClassBindings[i]);
-          if (parsedPath.path === '') {
-            parsedPath.stream = new SimpleStream(true);
-          } else {
-            parsedPath.stream = view.getStream(parsedPath.path);
-          }
-          itemClassBindings[i] = parsedPath;
-        }
-
-        viewOptions.classNameBindings = itemClassBindings;
+        viewOptions.classNameBindings = map(itemClassBindings, function(classBinding){
+          return streamifyClassNameBinding(view, classBinding);
+        });
       }
 
       hash.itemViewClass = itemViewClass;
@@ -6883,6 +6787,7 @@ enifed("ember-htmlbars/helpers/if_unless",
       options.helperName = options.helperName || ('if ');
 
       if (env.data.isUnbound) {
+        env.data.isUnbound = false;
         return env.helpers.unboundIf.helperFunction.call(this, params, hash, options, env);
       } else {
         return env.helpers.boundIf.helperFunction.call(this, params, hash, options, env);
@@ -6910,6 +6815,7 @@ enifed("ember-htmlbars/helpers/if_unless",
       options.helperName = options.helperName || helperName;
 
       if (env.data.isUnbound) {
+        env.data.isUnbound = false;
         return env.helpers.unboundIf.helperFunction.call(this, params, hash, options, env);
       } else {
         return env.helpers.boundIf.helperFunction.call(this, params, hash, options, env);
@@ -7235,14 +7141,15 @@ enifed("ember-htmlbars/helpers/log",
     __exports__.logHelper = logHelper;
   });
 enifed("ember-htmlbars/helpers/partial",
-  ["ember-metal/core","ember-metal/is_none","./binding","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/core","ember-metal/is_none","./binding","ember-metal/streams/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert
 
     var isNone = __dependency2__["default"];
     var bind = __dependency3__.bind;
+    var isStream = __dependency4__.isStream;
 
     /**
     @module ember
@@ -7294,7 +7201,7 @@ enifed("ember-htmlbars/helpers/partial",
 
       var name = params[0];
 
-      if (name && name.isStream) {
+      if (isStream(name)) {
         options.template = createPartialTemplate(name);
         bind.call(this, name, hash, options, env, true, exists);
       } else {
@@ -7642,8 +7549,8 @@ enifed("ember-htmlbars/helpers/unbound",
     __exports__.unboundHelper = unboundHelper;
   });
 enifed("ember-htmlbars/helpers/view",
-  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/keys","ember-metal/mixin","ember-metal/streams/utils","ember-views/streams/utils","ember-views/views/view","ember-metal/streams/simple","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/streams/simple","ember-metal/keys","ember-metal/mixin","ember-metal/streams/utils","ember-views/streams/utils","ember-views/views/view","ember-metal/enumerable_utils","ember-views/streams/class_name_binding","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -7655,13 +7562,16 @@ enifed("ember-htmlbars/helpers/view",
 
     var EmberObject = __dependency2__["default"];
     var get = __dependency3__.get;
-    var keys = __dependency4__["default"];
-    var IS_BINDING = __dependency5__.IS_BINDING;
-    var read = __dependency6__.read;
-    var isStream = __dependency6__.isStream;
-    var readViewFactory = __dependency7__.readViewFactory;
-    var View = __dependency8__["default"];
-    var SimpleStream = __dependency9__["default"];
+    var SimpleStream = __dependency4__["default"];
+    var keys = __dependency5__["default"];
+    var IS_BINDING = __dependency6__.IS_BINDING;
+    var read = __dependency7__.read;
+    var isStream = __dependency7__.isStream;
+    var readViewFactory = __dependency8__.readViewFactory;
+    var View = __dependency9__["default"];
+
+    var map = __dependency10__.map;
+    var streamifyClassNameBinding = __dependency11__.streamifyClassNameBinding;
 
     function makeBindings(hash, options, view) {
       for (var prop in hash) {
@@ -7751,17 +7661,17 @@ enifed("ember-htmlbars/helpers/view",
           }
         }
 
-        var classNameBindings = extensions.classNameBindings;
-        if (classNameBindings) {
-          for (var j = 0; j < classNameBindings.length; j++) {
-            var parsedPath = View._parsePropertyPath(classNameBindings[j]);
-            if (parsedPath.path === '') {
-              parsedPath.stream = new SimpleStream(true);
+        if (extensions.classNameBindings) {
+          extensions.classNameBindings = map(extensions.classNameBindings, function(classNameBinding){
+            var binding = streamifyClassNameBinding(view, classNameBinding);
+            if (isStream(binding)) {
+              return binding;
             } else {
-              parsedPath.stream = view.getStream(parsedPath.path);
+              // returning a stream informs the classNameBindings logic
+              // in views/view that this value is already processed.
+              return new SimpleStream(binding);
             }
-            classNameBindings[j] = parsedPath;
-          }
+          });
         }
 
         return extensions;
@@ -7770,12 +7680,18 @@ enifed("ember-htmlbars/helpers/view",
       helper: function(newView, hash, options, env) {
         var data = env.data;
         var template = options.template;
+        var newViewProto;
 
         makeBindings(hash, options, env.data.view);
 
         var viewOptions = this.propertiesFromHTMLOptions(hash, options, env);
         var currentView = data.view;
-        var newViewProto = newView.proto();
+
+        if (View.detectInstance(newView)) {
+          newViewProto = newView;
+        } else {
+          newViewProto = newView.proto();
+        }
 
         if (template) {
           Ember.assert(
@@ -8111,7 +8027,7 @@ enifed("ember-htmlbars/helpers/with",
 
       var preserveContext;
 
-      if (hash.keywordName || options.blockParams) {
+      if (options.blockParams) {
         preserveContext = true;
       } else {
         Ember.deprecate(
@@ -8245,8 +8161,8 @@ enifed("ember-htmlbars/helpers/yield",
     __exports__.yieldHelper = yieldHelper;
   });
 enifed("ember-htmlbars/hooks/attribute",
-  ["ember-htmlbars/attr_nodes","ember-metal/error","ember-metal/streams/utils","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-htmlbars/attr_nodes","ember-metal/error","ember-metal/streams/utils","ember-views/system/sanitize_attribute_value","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -8256,6 +8172,7 @@ enifed("ember-htmlbars/hooks/attribute",
     var attrNodeTypeFor = __dependency1__["default"];
     var EmberError = __dependency2__["default"];
     var isStream = __dependency3__.isStream;
+    var sanitizeAttributeValue = __dependency4__["default"];
 
     var boundAttributesEnabled = false;
 
@@ -8268,7 +8185,8 @@ enifed("ember-htmlbars/hooks/attribute",
         if (isStream(attrValue)) {
           throw new EmberError('Bound attributes are not yet supported in Ember.js');
         } else {
-          env.dom.setAttribute(element, attrName, attrValue);
+          var sanitizedValue = sanitizeAttributeValue(element, attrName, attrValue);
+          env.dom.setAttribute(element, attrName, sanitizedValue);
         }
       }
     }
@@ -8295,51 +8213,23 @@ enifed("ember-htmlbars/hooks/component",
     }
   });
 enifed("ember-htmlbars/hooks/concat",
-  ["ember-metal/streams/stream","ember-metal/streams/utils","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+  ["ember-metal/streams/utils","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-htmlbars
     */
 
-    var Stream = __dependency1__["default"];
-    var isStream = __dependency2__.isStream;
-    var readArray = __dependency2__.readArray;
-    var subscribe = __dependency2__.subscribe;
+    var streamConcat = __dependency1__.concat;
 
-    // TODO: Create subclass ConcatStream < Stream. Defer
-    // subscribing to streams until the value() is called.
     __exports__["default"] = function concat(params) {
-      var i;
-      var isStatic = true;
-
-      for (i = 0; i < params.length; i++) {
-        if (isStream(params[i])) {
-          isStatic = false;
-          break;
-        }
-      }
-
-      if (isStatic) {
-        return params.join('');
-      } else {
-        var stream = new Stream(function() {
-          return readArray(params).join('');
-        });
-
-        for (i = 0; i < params.length; i++) {
-          subscribe(params[i], stream.notify, stream);
-        }
-
-        return stream;
-      }
-
+      return streamConcat(params, '');
     }
   });
 enifed("ember-htmlbars/hooks/content",
-  ["ember-htmlbars/hooks/subexpr","ember-views/views/simple_bound_view","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+  ["ember-htmlbars/hooks/subexpr","ember-views/views/simple_bound_view","ember-metal/streams/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -8348,11 +8238,12 @@ enifed("ember-htmlbars/hooks/content",
 
     var subexpr = __dependency1__["default"];
     var appendSimpleBoundView = __dependency2__.appendSimpleBoundView;
+    var isStream = __dependency3__.isStream;
 
     __exports__["default"] = function content(morph, path, view, params, hash, options, env) {
       var result = subexpr(path, view, params, hash, options, env);
 
-      if (result && result.isStream) {
+      if (isStream(result)) {
         appendSimpleBoundView(view, morph, result);
       } else {
         morph.update(result);
@@ -8431,120 +8322,8 @@ enifed("ember-htmlbars/hooks/subexpr",
       }
     }
   });
-enifed("ember-htmlbars/plugins/transform-each-in-to-hash",
-  ["htmlbars-syntax/walker","htmlbars-syntax/builders","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
-    "use strict";
-    var Walker = __dependency1__["default"];
-    var b = __dependency2__["default"];
-
-    /**
-      An HTMLBars AST transformation that replaces all instances of
-
-      ```handlebars
-      {{#each item in items}}
-      {{/each}}
-      ```
-
-      with
-
-      ```handlebars
-      {{#each items keyword="item"}}
-      {{/each}}
-      ```
-
-      @private
-      @param {AST} The AST to be transformed.
-    */
-    __exports__["default"] = function(ast) {
-      var walker = new Walker();
-
-      walker.visit(ast, function(node) {
-        if (validate(node)) {
-          var removedParams = node.sexpr.params.splice(0, 2);
-          var keyword = removedParams[0].original;
-
-          // TODO: This may not be necessary.
-          if (!node.sexpr.hash) {
-            node.sexpr.hash = b.hash();
-          }
-
-          node.sexpr.hash.pairs.push(b.pair(
-            'keyword',
-            b.string(keyword)
-          ));
-        }
-      });
-
-      return ast;
-    }
-
-    function 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';
-    }
-  });
-enifed("ember-htmlbars/plugins/transform-with-as-to-hash",
-  ["htmlbars-syntax/walker","htmlbars-syntax/builders","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
-    "use strict";
-    var Walker = __dependency1__["default"];
-    var b = __dependency2__["default"];
-
-    /**
-      An HTMLBars AST transformation that replaces all instances of
-
-      ```handlebars
-      {{#with foo.bar as bar}}
-      {{/with}}
-      ```
-
-      with
-
-      ```handlebars
-      {{#with foo.bar keywordName="bar"}}
-      {{/with}}
-      ```
-
-      @private
-      @param {AST} The AST to be transformed.
-    */
-    __exports__["default"] = function(ast) {
-      var walker = new Walker();
-
-      walker.visit(ast, function(node) {
-        if (validate(node)) {
-          var removedParams = node.sexpr.params.splice(1, 2);
-          var keyword = removedParams[1].original;
-
-          // TODO: This may not be necessary.
-          if (!node.sexpr.hash) {
-            node.sexpr.hash = b.hash();
-          }
-
-          node.sexpr.hash.pairs.push(b.pair(
-            'keywordName',
-            b.string(keyword)
-          ));
-        }
-      });
-
-      return ast;
-    }
-
-    function validate(node) {
-      return node.type === 'BlockStatement' &&
-        node.sexpr.path.original === 'with' &&
-        node.sexpr.params.length === 3 &&
-        node.sexpr.params[1].type === 'PathExpression' &&
-        node.sexpr.params[1].original === 'as';
-    }
-  });
 enifed("ember-htmlbars/system/bootstrap",
-  ["ember-metal/core","ember-views/component_lookup","ember-views/system/jquery","ember-metal/error","ember-runtime/system/lazy_load","ember-htmlbars/system/compile","exports"],
+  ["ember-metal/core","ember-views/component_lookup","ember-views/system/jquery","ember-metal/error","ember-runtime/system/lazy_load","ember-template-compiler/system/compile","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
     /*globals Handlebars */
@@ -8650,48 +8429,6 @@ enifed("ember-htmlbars/system/bootstrap",
 
     __exports__["default"] = bootstrap;
   });
-enifed("ember-htmlbars/system/compile",
-  ["ember-metal/core","htmlbars-compiler/compiler","ember-htmlbars/system/template","ember-htmlbars/plugins/transform-each-in-to-hash","ember-htmlbars/plugins/transform-with-as-to-hash","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
-    "use strict";
-    /**
-    @module ember
-    @submodule ember-htmlbars
-    */
-
-    var Ember = __dependency1__["default"];
-    var compile = __dependency2__.compile;
-    var template = __dependency3__["default"];
-
-    var transformEachInToHash = __dependency4__["default"];
-    var transformWithAsToHash = __dependency5__["default"];
-
-    var disableComponentGeneration = true;
-    
-    /**
-      Uses HTMLBars `compile` function to process a string into a compiled template.
-
-      This is not present in production builds.
-
-      @private
-      @method template
-      @param {String} templateString This is the string to be compiled by HTMLBars.
-    */
-    __exports__["default"] = function(templateString) {
-      var templateSpec = compile(templateString, {
-        disableComponentGeneration: disableComponentGeneration,
-
-        plugins: {
-          ast: [
-            transformEachInToHash,
-            transformWithAsToHash
-          ]
-        }
-      });
-
-      return template(templateSpec);
-    }
-  });
 enifed("ember-htmlbars/system/helper",
   ["exports"],
   function(__exports__) {
@@ -8755,8 +8492,9 @@ enifed("ember-htmlbars/system/lookup-helper",
       @return {Handlebars Helper}
     */
     __exports__["default"] = function lookupHelper(name, view, env) {
-      if (env.helpers[name]) {
-        return env.helpers[name];
+      var helper = env.helpers[name];
+      if (helper) {
+        return helper;
       }
 
       var container = view.container;
@@ -8766,7 +8504,7 @@ enifed("ember-htmlbars/system/lookup-helper",
       }
 
       var helperName = 'helper:' + name;
-      var helper = container.lookup(helperName);
+      helper = container.lookup(helperName);
       if (!helper) {
         var componentLookup = container.lookup('component-lookup:main');
         Ember.assert("Could not find 'component-lookup:main' on the provided container," +
@@ -8824,8 +8562,8 @@ enifed("ember-htmlbars/system/make-view-helper",
     }
   });
 enifed("ember-htmlbars/system/make_bound_helper",
-  ["ember-metal/core","ember-metal/mixin","ember-views/views/simple_bound_view","ember-htmlbars/system/helper","ember-metal/streams/stream","ember-metal/streams/utils","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+  ["ember-metal/core","ember-htmlbars/system/helper","ember-metal/streams/stream","ember-metal/streams/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -8834,14 +8572,14 @@ enifed("ember-htmlbars/system/make_bound_helper",
 
     var Ember = __dependency1__["default"];
     // Ember.FEATURES, Ember.assert, Ember.Handlebars, Ember.lookup
-    var IS_BINDING = __dependency2__.IS_BINDING;
-    var appendSimpleBoundView = __dependency3__.appendSimpleBoundView;
-    var Helper = __dependency4__["default"];
+    var Helper = __dependency2__["default"];
 
-    var Stream = __dependency5__["default"];
-    var readArray = __dependency6__.readArray;
-    var readHash = __dependency6__.readHash;
-    var subscribe = __dependency6__.subscribe;
+    var Stream = __dependency3__["default"];
+    var readArray = __dependency4__.readArray;
+    var readHash = __dependency4__.readHash;
+    var subscribe = __dependency4__.subscribe;
+    var scanHash = __dependency4__.scanHash;
+    var scanArray = __dependency4__.scanArray;
 
     /**
       Create a bound helper. Accepts a function that receives the ordered and hash parameters
@@ -8851,9 +8589,9 @@ enifed("ember-htmlbars/system/make_bound_helper",
 
       * `params` - An array of resolved ordered parameters.
       * `hash` - An object containing the hash parameters.
-     
+
       For example:
-      
+
       * With an unqouted ordered parameter:
 
         ```javascript
@@ -8864,7 +8602,7 @@ enifed("ember-htmlbars/system/make_bound_helper",
         an empty hash as its second.
 
       * With a quoted ordered parameter:
-     
+
         ```javascript
         {{x-capitalize "foo"}}
         ```
@@ -8872,7 +8610,7 @@ enifed("ember-htmlbars/system/make_bound_helper",
         The bound helper would receive `["foo"]` as its first argument, and an empty hash as its second.
 
       * With an unquoted hash parameter:
-     
+
         ```javascript
         {{x-repeat "foo" count=repeatCount}}
         ```
@@ -8889,30 +8627,25 @@ enifed("ember-htmlbars/system/make_bound_helper",
     __exports__["default"] = function makeBoundHelper(fn) {
       function helperFunc(params, hash, options, env) {
         var view = this;
+        var numParams = params.length;
+        var param, prop;
 
         Ember.assert("makeBoundHelper generated helpers do not support use with blocks", !options.template);
 
-        for (var prop in hash) {
-          if (IS_BINDING.test(prop)) {
-            hash[prop.slice(0, -7)] = view._getBindingForStream(hash[prop]);
-
-            delete hash[prop];
-          }
-        }
-
         function valueFn() {
           return fn.call(view, readArray(params), readHash(hash), options, env);
         }
 
-        if (env.data.isUnbound) {
+        // If none of the hash parameters are bound, act as an unbound helper.
+        // This prevents views from being unnecessarily created
+        var hasStream = scanArray(params) || scanHash(hash);
+
+        if (env.data.isUnbound || !hasStream) {
           return valueFn();
         } else {
           var lazyValue = new Stream(valueFn);
 
-          appendSimpleBoundView(this, options.morph, lazyValue);
-
-          var param;
-          for (var i = 0, l = params.length; i < l; i++) {
+          for (var i = 0; i < numParams; i++) {
             param = params[i];
             subscribe(param, lazyValue.notify, lazyValue);
           }
@@ -8921,39 +8654,50 @@ enifed("ember-htmlbars/system/make_bound_helper",
             param = hash[prop];
             subscribe(param, lazyValue.notify, lazyValue);
           }
+
+          return lazyValue;
         }
       }
 
       return new Helper(helperFunc);
     }
   });
-enifed("ember-htmlbars/system/template",
-  ["exports"],
-  function(__exports__) {
+enifed("ember-htmlbars/templates/component",
+  ["ember-template-compiler/system/template","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
-    /**
-    @module ember
-    @submodule ember-htmlbars
-    */
-
-    /**
-      Augments the detault precompiled output of an HTMLBars template with
-      additional information needed by Ember.
-
-      @private
-      @method template
-      @param {Function} templateSpec This is the compiled HTMLBars template spec.
-    */
-
-    __exports__["default"] = function(templateSpec) {
-      templateSpec.isTop = true;
-      templateSpec.isMethod = false;
-
-      return templateSpec;
-    }
+    var template = __dependency1__["default"];
+    var t = (function() {
+      return {
+        isHTMLBars: true,
+        cachedFragment: null,
+        build: function build(dom) {
+          var el0 = dom.createDocumentFragment();
+          var el1 = dom.createTextNode("");
+          dom.appendChild(el0, el1);
+          var el1 = dom.createTextNode("");
+          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);
+          if (this.cachedFragment === null) {
+            this.cachedFragment = this.build(dom);
+          }
+          var fragment = dom.cloneNode(this.cachedFragment, true);
+          dom.repairClonedNode(fragment,[0,1]);
+          var morph0 = dom.createMorphAt(fragment,0,1,contextualElement);
+          content(morph0, "yield", context, [], {}, {morph: morph0}, env);
+          return fragment;
+        }
+      };
+    }());
+     __exports__["default"] = template(t);
   });
 enifed("ember-htmlbars/templates/select",
-  ["ember-htmlbars/system/template","exports"],
+  ["ember-template-compiler/system/template","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
     var template = __dependency1__["default"];
@@ -9487,8 +9231,8 @@ enifed("ember-metal-views/renderer",
     __exports__["default"] = Renderer;
   });
 enifed("ember-metal",
-  ["ember-metal/core","ember-metal/merge","ember-metal/instrumentation","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/cache","ember-metal/platform","ember-metal/array","ember-metal/logger","ember-metal/property_get","ember-metal/events","ember-metal/observer_set","ember-metal/property_events","ember-metal/properties","ember-metal/property_set","ember-metal/map","ember-metal/get_properties","ember-metal/set_properties","ember-metal/watch_key","ember-metal/chains","ember-metal/watch_path","ember-metal/watching","ember-metal/expand_properties","ember-metal/computed","ember-metal/computed_macros","ember-metal/observer","ember-metal/mixin","ember-metal/binding","ember-metal/run_loop","ember-metal/libraries","ember-metal/is_none","ember-metal/is_empty","ember-metal/is_blank","ember-metal/is_present","ember-metal/keys","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __dependency34__, __dependency35__, __dependency36__, __exports__) {
+  ["ember-metal/core","ember-metal/merge","ember-metal/instrumentation","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/cache","ember-metal/platform","ember-metal/array","ember-metal/logger","ember-metal/property_get","ember-metal/events","ember-metal/observer_set","ember-metal/property_events","ember-metal/properties","ember-metal/property_set","ember-metal/map","ember-metal/get_properties","ember-metal/set_properties","ember-metal/watch_key","ember-metal/chains","ember-metal/watch_path","ember-metal/watching","ember-metal/expand_properties","ember-metal/computed","ember-metal/computed_macros","ember-metal/observer","ember-metal/mixin","ember-metal/binding","ember-metal/run_loop","ember-metal/libraries","ember-metal/is_none","ember-metal/is_empty","ember-metal/is_blank","ember-metal/is_present","ember-metal/keys","backburner","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __dependency34__, __dependency35__, __dependency36__, __dependency37__, __exports__) {
     "use strict";
     /**
     Ember Metal
@@ -9620,6 +9364,7 @@ enifed("ember-metal",
     var isBlank = __dependency34__["default"];
     var isPresent = __dependency35__["default"];
     var keys = __dependency36__["default"];
+    var Backburner = __dependency37__["default"];
 
     // END IMPORTS
 
@@ -9764,6 +9509,13 @@ enifed("ember-metal",
 
     Ember.run = run;
 
+    /**
+     * @class Backburner
+     * @for Ember
+     * @private
+    */
+    Ember.Backburner = Backburner;
+
     Ember.libraries = new Libraries();
     Ember.libraries.registerCoreLibrary('Ember', Ember.VERSION);
 
@@ -12324,7 +12076,7 @@ enifed("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.10.0-beta.1
+      @version 1.10.0-beta.2
     */
 
     if ('undefined' === typeof Ember) {
@@ -12351,10 +12103,10 @@ enifed("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.10.0-beta.1'
+      @default '1.10.0-beta.2'
       @static
     */
-    Ember.VERSION = '1.10.0-beta.1';
+    Ember.VERSION = '1.10.0-beta.2';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -13505,17 +13257,16 @@ enifed("ember-metal/get_properties",
     }
   });
 enifed("ember-metal/injected_property",
-  ["ember-metal/core","ember-metal/computed","ember-metal/properties","ember-metal/platform","ember-metal/utils","ember-metal/error","exports"],
+  ["ember-metal/core","ember-metal/computed","ember-metal/alias","ember-metal/properties","ember-metal/platform","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert
     var ComputedProperty = __dependency2__.ComputedProperty;
-    var Descriptor = __dependency3__.Descriptor;
-    var create = __dependency4__.create;
-    var meta = __dependency5__.meta;
-    var inspect = __dependency5__.inspect;
-    var EmberError = __dependency6__["default"];
+    var AliasedProperty = __dependency3__.AliasedProperty;
+    var Descriptor = __dependency4__.Descriptor;
+    var create = __dependency5__.create;
+    var meta = __dependency6__.meta;
 
     /**
       Read-only property that returns the result of a container lookup.
@@ -13533,7 +13284,7 @@ enifed("ember-metal/injected_property",
       this.name = name;
 
       this._super$Constructor(injectedPropertyGet);
-      this.readOnly();
+      AliasedPropertyPrototype.oneWay.call(this);
     }
 
     function injectedPropertyGet(keyName) {
@@ -13546,22 +13297,17 @@ enifed("ember-metal/injected_property",
       return this.container.lookup(desc.type + ':' + (desc.name || keyName));
     }
 
-    function injectedPropertySet(obj, keyName) {
-      throw new EmberError("Cannot set injected property '" + keyName + "' on object: " + inspect(obj));
-    }
-
     InjectedProperty.prototype = create(Descriptor.prototype);
 
     var InjectedPropertyPrototype = InjectedProperty.prototype;
     var ComputedPropertyPrototype = ComputedProperty.prototype;
+    var AliasedPropertyPrototype = AliasedProperty.prototype;
 
     InjectedPropertyPrototype._super$Constructor = ComputedProperty;
 
     InjectedPropertyPrototype.get = ComputedPropertyPrototype.get;
     InjectedPropertyPrototype.readOnly = ComputedPropertyPrototype.readOnly;
 
-    InjectedPropertyPrototype.set = injectedPropertySet;
-
     InjectedPropertyPrototype.teardown = ComputedPropertyPrototype.teardown;
 
     __exports__["default"] = InjectedProperty;
@@ -13656,6 +13402,11 @@ enifed("ember-metal/instrumentation",
       @param {Object} binding Context that instrument function is called with.
     */
     function instrument(name, _payload, callback, binding) {
+      if (arguments.length <= 3 && typeof _payload === 'function') {
+        binding = callback;
+        callback = _payload;
+        _payload = undefined;
+      }
       if (subscribers.length === 0) {
         return callback.call(binding);
       }
@@ -14800,8 +14551,8 @@ enifed("ember-metal/merge",
     }
   });
 enifed("ember-metal/mixin",
-  ["ember-metal/core","ember-metal/merge","ember-metal/array","ember-metal/platform","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","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
+  ["ember-metal/core","ember-metal/merge","ember-metal/array","ember-metal/platform","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","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
         // Remove "use strict"; from transpiled module until
     // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
     //
@@ -14838,6 +14589,7 @@ enifed("ember-metal/mixin",
     var _suspendObserver = __dependency12__._suspendObserver;
     var addListener = __dependency13__.addListener;
     var removeListener = __dependency13__.removeListener;
+    var isStream = __dependency14__.isStream;
 
     var REQUIRED;
     var a_slice = [].slice;
@@ -15150,7 +14902,7 @@ enifed("ember-metal/mixin",
           binding = bindings[key];
           if (binding) {
             to = key.slice(0, -7); // strip Binding off end
-            if (binding.isStream) {
+            if (isStream(binding)) {
               connectStreamBinding(obj, to, binding);
               continue;
             } else if (binding instanceof Binding) {
@@ -15926,7 +15678,7 @@ enifed("ember-metal/path_cache",
 
     var isGlobalCache       = new Cache(1000, function(key) { return IS_GLOBAL.test(key);          });
     var isGlobalPathCache   = new Cache(1000, function(key) { return IS_GLOBAL_PATH.test(key);     });
-    var hasThisCache        = new Cache(1000, function(key) { return key.indexOf(HAS_THIS) !== -1; });
+    var hasThisCache        = new Cache(1000, function(key) { return key.lastIndexOf(HAS_THIS, 0) === 0; });
     var firstDotIndexCache  = new Cache(1000, function(key) { return key.indexOf('.');             });
 
     var firstKeyCache = new Cache(1000, function(path) {
@@ -16200,6 +15952,13 @@ enifed("ember-metal/platform/define_property",
         // Object.defineProperty once accessors have already been set.
         if (obj.a !== true) return;
 
+        // 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', {
+          enumerable: false
+        });
+        if (obj.a !== true) return;
+
         // defineProperty is compliant
         return defineProperty;
       } catch (e) {
@@ -16960,13 +16719,15 @@ enifed("ember-metal/property_set",
         if (isUnknown && 'function' === typeof obj.setUnknownProperty) {
           obj.setUnknownProperty(keyName, value);
         } else if (meta && meta.watching[keyName] > 0) {
-          
-            if (hasPropertyAccessors) {
-              currentValue = meta.values[keyName];
-            } else {
-              currentValue = obj[keyName];
-            }
-                    // only trigger a change if the value has changed
+          if (meta.proto !== obj) {
+            
+              if (hasPropertyAccessors) {
+                currentValue = meta.values[keyName];
+              } else {
+                currentValue = obj[keyName];
+              }
+                      }
+          // only trigger a change if the value has changed
           if (value !== currentValue) {
             propertyWillChange(obj, keyName);
             
@@ -17088,7 +16849,7 @@ enifed("ember-metal/run_loop",
 
       ```javascript
       run(function() {
-        // code to be execute within a RunLoop
+        // code to be executed within a RunLoop
       });
       ```
 
@@ -17214,7 +16975,7 @@ enifed("ember-metal/run_loop",
 
       ```javascript
       run.begin();
-      // code to be execute within a RunLoop
+      // code to be executed within a RunLoop
       run.end();
       ```
 
@@ -17232,7 +16993,7 @@ enifed("ember-metal/run_loop",
 
       ```javascript
       run.begin();
-      // code to be execute within a RunLoop
+      // code to be executed within a RunLoop
       run.end();
       ```
 
@@ -17722,12 +17483,13 @@ enifed("ember-metal/streams/simple",
     var Stream = __dependency2__["default"];
     var create = __dependency3__.create;
     var read = __dependency4__.read;
+    var isStream = __dependency4__.isStream;
 
     function SimpleStream(source) {
       this.init();
       this.source = source;
 
-      if (source && source.isStream) {
+      if (isStream(source)) {
         source.subscribe(this._didChange, this);
       }
     }
@@ -17742,7 +17504,7 @@ enifed("ember-metal/streams/simple",
       setValue: function(value) {
         var source = this.source;
 
-        if (source && source.isStream) {
+        if (isStream(source)) {
           source.setValue(value);
         }
       },
@@ -17750,11 +17512,11 @@ enifed("ember-metal/streams/simple",
       setSource: function(nextSource) {
         var prevSource = this.source;
         if (nextSource !== prevSource) {
-          if (prevSource && prevSource.isStream) {
+          if (isStream(prevSource)) {
             prevSource.unsubscribe(this._didChange, this);
           }
 
-          if (nextSource && nextSource.isStream) {
+          if (isStream(nextSource)) {
             nextSource.subscribe(this._didChange, this);
           }
 
@@ -17771,7 +17533,7 @@ enifed("ember-metal/streams/simple",
 
       destroy: function() {
         if (this._super$destroy()) {
-          if (this.source && this.source.isStream) {
+          if (isStream(this.source)) {
             this.source.unsubscribe(this._didChange, this);
           }
           this.source = undefined;
@@ -17911,7 +17673,7 @@ enifed("ember-metal/streams/stream",
             children[key].destroy();
           }
 
-          return true;      
+          return true;
         }
       },
 
@@ -18011,9 +17773,11 @@ enifed("ember-metal/streams/stream_binding",
     __exports__["default"] = StreamBinding;
   });
 enifed("ember-metal/streams/utils",
-  ["exports"],
-  function(__exports__) {
+  ["./stream","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
+    var Stream = __dependency1__["default"];
+
     function isStream(object) {
       return object && object.isStream;
     }
@@ -18055,7 +17819,74 @@ enifed("ember-metal/streams/utils",
       return ret;
     }
 
-    __exports__.readHash = readHash;
+    __exports__.readHash = readHash;/**
+     * @function scanArray
+     * @param array Array array given to a handlebars helper
+     * @return Boolean whether the array contains a stream/bound value
+    */
+    function scanArray(array) {
+      var length = array.length;
+      var containsStream = false;
+
+      for (var i = 0; i < length; i++){
+        if (isStream(array[i])) {
+          containsStream = true;
+          break;
+        }
+      }
+
+      return containsStream;
+    }
+
+    __exports__.scanArray = scanArray;/**
+     * @function scanHash
+     * @param Object hash "hash" argument given to a handlebars helper
+     * @return Boolean whether the object contains a stream/bound value
+    */
+    function scanHash(hash) {
+      var containsStream = false;
+
+      for (var prop in hash) {
+        if (isStream(hash[prop])) {
+          containsStream = true;
+          break;
+        }
+      }
+
+      return containsStream;
+    }
+
+    __exports__.scanHash = scanHash;// TODO: Create subclass ConcatStream < Stream. Defer
+    // subscribing to streams until the value() is called.
+    function concat(array, key) {
+      var hasStream = scanArray(array);
+      if (hasStream) {
+        var i, l;
+        var stream = new Stream(function() {
+          return readArray(array).join(key);
+        });
+
+        for (i = 0, l=array.length; i < l; i++) {
+          subscribe(array[i], stream.notify, stream);
+        }
+
+        return stream;
+      } else {
+        return array.join(key);
+      }
+    }
+
+    __exports__.concat = concat;function chainStream(value, fn) {
+      if (isStream(value)) {
+        var stream = new Stream(fn);
+        subscribe(value, stream.notify, stream);
+        return stream;
+      } else {
+        return fn();
+      }
+    }
+
+    __exports__.chainStream = chainStream;
   });
 enifed("ember-metal/utils",
   ["ember-metal/core","ember-metal/platform","ember-metal/array","exports"],
@@ -19235,8 +19066,8 @@ enifed("ember-routing-htmlbars",
     __exports__["default"] = Ember;
   });
 enifed("ember-routing-htmlbars/helpers/action",
-  ["ember-metal/core","ember-metal/utils","ember-metal/run_loop","ember-views/streams/utils","ember-views/system/utils","ember-views/system/action_manager","ember-metal/array","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+  ["ember-metal/core","ember-metal/utils","ember-metal/run_loop","ember-views/streams/utils","ember-views/system/utils","ember-views/system/action_manager","ember-metal/array","ember-metal/streams/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -19251,6 +19082,7 @@ enifed("ember-routing-htmlbars/helpers/action",
     var isSimpleClick = __dependency5__.isSimpleClick;
     var ActionManager = __dependency6__["default"];
     var indexOf = __dependency7__.indexOf;
+    var isStream = __dependency8__.isStream;
 
     function actionArgs(parameters, actionName) {
       var ret, i, l;
@@ -19336,7 +19168,7 @@ enifed("ember-routing-htmlbars/helpers/action",
           
           var actionName;
 
-          if (actionNameOrStream.isStream) {
+          if (isStream(actionNameOrStream)) {
             actionName = actionNameOrStream.value();
 
             Ember.assert("You specified a quoteless path to the {{action}} helper " +
@@ -19533,7 +19365,7 @@ enifed("ember-routing-htmlbars/helpers/action",
       var target;
       if (!hash.target) {
         target = this.getStream('controller');
-      } else if (hash.target.isStream) {
+      } else if (isStream(hash.target)) {
         target = hash.target;
       } else {
         target = this.getStream(hash.target);
@@ -20358,6 +20190,22 @@ enifed("ember-routing-views/views/link",
       **/
       rel: null,
 
+      /**
+        Sets the `tabindex` attribute of the `LinkView`'s HTML element.
+
+        @property tabindex
+        @default null
+      **/
+      tabindex: null,
+
+      /**
+        Sets the `target` attribute of the `LinkView`'s HTML element.
+
+        @property target
+        @default null
+      **/
+      target: null,
+
       /**
         The CSS class to apply to `LinkView`'s element when its `active`
         property is `true`.
@@ -20406,7 +20254,7 @@ enifed("ember-routing-views/views/link",
 
         @property attributeBindings
         @type Array | String
-        @default ['href', 'title', 'rel']
+        @default ['href', 'title', 'rel', 'tabindex', 'target']
        **/
       attributeBindings: ['href', 'title', 'rel', 'tabindex'],
 
@@ -21159,13 +21007,28 @@ enifed("ember-routing/ext/controller",
         ```javascript
         aController.transitionToRoute('/');
         aController.transitionToRoute('/blog/post/1/comment/13');
+        aController.transitionToRoute('/blog/posts?sort=title');
+        ```
+
+        An options hash with a `queryParams` property may be provided as
+        the final argument to add query parameters to the destination URL.
+
+        ```javascript
+        aController.transitionToRoute('blogPost', 1, {
+          queryParams: {showComments: 'true'}
+        });
+
+        // if you just want to transition the query parameters without changing the route
+        aController.transitionToRoute({queryParams: {sort: 'date'}});
         ```
 
         See also [replaceRoute](/api/classes/Ember.ControllerMixin.html#method_replaceRoute).
 
         @param {String} name the name of the route or a URL
         @param {...Object} models the model(s) or identifier(s) to be used
-        while transitioning to the route.
+          while transitioning to the route.
+        @param {Object} [options] optional hash with a queryParams property
+          containing a mapping of query parameters
         @for Ember.ControllerMixin
         @method transitionToRoute
       */
@@ -23451,7 +23314,7 @@ enifed("ember-routing/system/route",
       _actions: {
 
         queryParamsDidChange: function(changed, totalPresent, removed) {
-          var qpMap = this.get('_qp').map;
+          var qpMap = get(this, '_qp').map;
 
           var totalChanged = keys(changed).concat(keys(removed));
           for (var i = 0, len = totalChanged.length; i < len; ++i) {
@@ -23618,6 +23481,19 @@ enifed("ember-routing/system/route",
         ```javascript
         this.transitionTo('/');
         this.transitionTo('/blog/post/1/comment/13');
+        this.transitionTo('/blog/posts?sort=title');
+        ```
+
+        An options hash with a `queryParams` property may be provided as
+        the final argument to add query parameters to the destination URL.
+
+        ```javascript
+        this.transitionTo('blogPost', 1, {
+          queryParams: {showComments: 'true'}
+        });
+
+        // if you just want to transition the query parameters without changing the route
+        this.transitionTo({queryParams: {sort: 'date'}});
         ```
 
         See also 'replaceWith'.
@@ -23685,10 +23561,30 @@ enifed("ember-routing/system/route",
         });
         ```
 
+        Nested Route with Query String Example
+
+        ```javascript
+        App.Router.map(function() {
+          this.resource('fruits', function() {
+            this.route('apples');
+          });
+        });
+
+        App.IndexRoute = Ember.Route.extend({
+          actions: {
+            transitionToApples: function() {
+              this.transitionTo('fruits.apples', {queryParams: {color: 'red'}});
+            }
+          }
+        });
+        ```
+
         @method transitionTo
         @param {String} name the name of the route or a URL
         @param {...Object} models the model(s) or identifier(s) to be used while
           transitioning to the route.
+        @param {Object} [options] optional hash with a queryParams property
+          containing a mapping of query parameters
         @return {Transition} the transition object associated with this
           attempted transition
       */
@@ -23931,7 +23827,7 @@ enifed("ember-routing/system/route",
                 // convert the reject into a resolve and the
                 // transition would continue. To propagate the
                 // error so that it'd be handled by the `error`
-                // hook, you would have to either
+                // hook, you would have to
                 return Ember.RSVP.reject(e);
               });
             }
@@ -23941,7 +23837,6 @@ enifed("ember-routing/system/route",
 
         @method beforeModel
         @param {Transition} transition
-        @param {Object} queryParams the active query params for this route
         @return {Promise} if the value returned from this hook is
           a promise, the transition will pause until the transition
           resolves. Otherwise, non-promise return values are not
@@ -23975,7 +23870,6 @@ enifed("ember-routing/system/route",
         @param {Object} resolvedModel the value returned from `model`,
           or its resolved value if it was a promise
         @param {Transition} transition
-        @param {Object} queryParams the active query params for this handler
         @return {Promise} if the value returned from this hook is
           a promise, the transition will pause until the transition
           resolves. Otherwise, non-promise return values are not
@@ -24080,7 +23974,6 @@ enifed("ember-routing/system/route",
         @method model
         @param {Object} params the parameters extracted from the URL
         @param {Transition} transition
-        @param {Object} queryParams the query params for this route
         @return {Object|Promise} the model for this route. If
           a promise is returned, the transition will pause until
           the promise resolves, and the resolved value of the promise
@@ -24568,19 +24461,19 @@ enifed("ember-routing/system/route",
         @param {String} [options.model] the model object to set on `options.controller`
                         Defaults to the return value of the Route's model hook
       */
-      render: function(name, options) {
+      render: function(_name, options) {
         Ember.assert("The name in the given arguments is undefined", arguments.length > 0 ? !isNone(arguments[0]) : true);
 
-        var namePassed = typeof name === 'string' && !!name;
+        var namePassed = typeof _name === 'string' && !!_name;
+        var name;
 
-        if (typeof name === 'object' && !options) {
-          options = name;
+        if (typeof _name === 'object' && !options) {
           name = this.routeName;
+          options = _name;
+        } else {
+          name = _name;
         }
 
-        options = options || {};
-        options.namePassed = namePassed;
-
         var templateName;
 
         if (name) {
@@ -24591,30 +24484,43 @@ enifed("ember-routing/system/route",
           templateName = this.templateName || name;
         }
 
-        var viewName = options.view || namePassed && name || this.viewName || name;
+        var renderOptions = buildRenderOptions(this, namePassed, name, options);
 
-        var container = this.container;
-        var view = container.lookup('view:' + viewName);
-        var template = view ? view.get('template') : null;
-
-        if (!template) {
-          template = container.lookup('template:' + templateName);
-        }
+        var LOG_VIEW_LOOKUPS = get(this.router, 'namespace.LOG_VIEW_LOOKUPS');
+        var viewName = options && options.view || namePassed && name || this.viewName || name;
+        var view, template;
 
-        if (!view && !template) {
-          Ember.assert("Could not find \"" + name + "\" template or view.", Ember.isEmpty(arguments[0]));
-          if (get(this.router, 'namespace.LOG_VIEW_LOOKUPS')) {
-            Ember.Logger.info("Could not find \"" + name + "\" template or view. Nothing will be rendered", { fullName: 'template:' + name });
+        var ViewClass = this.container.lookupFactory('view:' + viewName);
+        if (ViewClass) {
+          view = setupView(ViewClass, renderOptions);
+          if (!get(view, 'template')) {
+            view.set('template', this.container.lookup('template:' + templateName));
+          }
+          if (LOG_VIEW_LOOKUPS) {
+            Ember.Logger.info("Rendering " + renderOptions.name + " with " + view, { fullName: 'view:' + renderOptions.name });
+          }
+        } else {
+          template = this.container.lookup('template:' + templateName);
+          if (!template) {
+            Ember.assert("Could not find \"" + name + "\" template or view.", arguments.length === 0 || Ember.isEmpty(arguments[0]));
+            if (LOG_VIEW_LOOKUPS) {
+              Ember.Logger.info("Could not find \"" + name + "\" template or view. Nothing will be rendered", { fullName: 'template:' + name });
+            }
+            return;
+          }
+          var defaultView = renderOptions.into ? 'view:default' : 'view:toplevel';
+          ViewClass = this.container.lookupFactory(defaultView);
+          view = setupView(ViewClass, renderOptions);
+          if (!get(view, 'template')) {
+            view.set('template', template);
+          }
+          if (LOG_VIEW_LOOKUPS) {
+            Ember.Logger.info("Rendering " + renderOptions.name + " with default view " + view, { fullName: 'view:' + renderOptions.name });
           }
-          return;
         }
 
-        options = normalizeOptions(this, name, template, options);
-        view = setupView(view, container, options);
-
-        if (options.outlet === 'main') { this.lastRenderedTemplate = name; }
-
-        appendView(this, view, options);
+        if (renderOptions.outlet === 'main') { this.lastRenderedTemplate = name; }
+        appendView(this, view, renderOptions);
       },
 
       /**
@@ -24737,25 +24643,15 @@ enifed("ember-routing/system/route",
       }
     }
 
-    function normalizeOptions(route, name, template, options) {
-      options = options || {};
-      options.into = options.into ? options.into.replace(/\//g, '.') : parentTemplate(route);
-      options.outlet = options.outlet || 'main';
-      options.name = name;
-      options.template = template;
-      options.LOG_VIEW_LOOKUPS = get(route.router, 'namespace.LOG_VIEW_LOOKUPS');
-
-      Ember.assert("An outlet ("+options.outlet+") was specified but was not found.", options.outlet === 'main' || options.into);
+    function buildRenderOptions(route, namePassed, name, options) {
+      var controller = options && options.controller;
 
-      var controller = options.controller;
-      var model = options.model;
-
-      if (options.controller) {
-        controller = options.controller;
-      } else if (options.namePassed) {
-        controller = route.container.lookup('controller:' + name) || route.controllerName || route.routeName;
-      } else {
-        controller = route.controllerName || route.container.lookup('controller:' + name);
+      if (!controller) {
+        if (namePassed) {
+          controller = route.container.lookup('controller:' + name) || route.controllerName || route.routeName;
+        } else {
+          controller = route.controllerName || route.container.lookup('controller:' + name);
+        }
       }
 
       if (typeof controller === 'string') {
@@ -24766,38 +24662,28 @@ enifed("ember-routing/system/route",
         }
       }
 
-      if (model) {
-        controller.set('model', model);
-      }
-
-      options.controller = controller;
-
-      return options;
-    }
-
-    function setupView(view, container, options) {
-      if (view) {
-        if (options.LOG_VIEW_LOOKUPS) {
-          Ember.Logger.info("Rendering " + options.name + " with " + view, { fullName: 'view:' + options.name });
-        }
-      } else {
-        var defaultView = options.into ? 'view:default' : 'view:toplevel';
-        view = container.lookup(defaultView);
-        if (options.LOG_VIEW_LOOKUPS) {
-          Ember.Logger.info("Rendering " + options.name + " with default view " + view, { fullName: 'view:' + options.name });
-        }
+      if (options && options.model) {
+        controller.set('model', options.model);
       }
 
-      if (!get(view, 'templateName')) {
-        set(view, 'template', options.template);
+      var renderOptions = {
+        into: options && options.into ? options.into.replace(/\//g, '.') : parentTemplate(route),
+        outlet: (options && options.outlet) || 'main',
+        name: name,
+        controller: controller
+      };
 
-        set(view, '_debugTemplateName', options.name);
-      }
+      Ember.assert("An outlet ("+renderOptions.outlet+") was specified but was not found.", renderOptions.outlet === 'main' || renderOptions.into);
 
-      set(view, 'renderedName', options.name);
-      set(view, 'controller', options.controller);
+      return renderOptions;
+    }
 
-      return view;
+    function setupView(ViewClass, options) {
+      return ViewClass.create({
+        _debugTemplateName: options.name,
+        renderedName: options.name,
+        controller: options.controller
+      });
     }
 
     function appendView(route, view, options) {
@@ -24808,7 +24694,7 @@ enifed("ember-routing/system/route",
         replace(route.teardownOutletViews, 0, 0, [teardownOutletView]);
         parentView.connectOutlet(options.outlet, view);
       } else {
-        var rootElement = get(route, 'router.namespace.rootElement');
+        var rootElement = get(route.router, 'namespace.rootElement');
         // tear down view if one is already rendered
         if (route.teardownTopLevelView) {
           route.teardownTopLevelView();
@@ -24921,6 +24807,7 @@ enifed("ember-routing/system/router",
       @class Router
       @namespace Ember
       @extends Ember.Object
+      @uses Ember.Evented
     */
     var EmberRouter = EmberObject.extend(Evented, {
       /**
@@ -28812,7 +28699,6 @@ enifed("ember-runtime/ext/rsvp",
           Ember.onerror(error);
         } else {
           Logger.error(error.stack);
-          Ember.assert(error, false);
         }
       }
     };
@@ -36759,6 +36645,301 @@ enifed("ember-runtime/system/tracked_array",
       this.rangeStart = rangeStart;
     }
   });
+enifed("ember-template-compiler",
+  ["ember-metal/core","ember-template-compiler/system/precompile","ember-template-compiler/system/compile","ember-template-compiler/system/template","ember-template-compiler/plugins","ember-template-compiler/plugins/transform-each-in-to-hash","ember-template-compiler/plugins/transform-with-as-to-hash","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var _Ember = __dependency1__["default"];
+    var precompile = __dependency2__["default"];
+    var compile = __dependency3__["default"];
+    var template = __dependency4__["default"];
+    var registerPlugin = __dependency5__.registerPlugin;
+
+    var TransformEachInToHash = __dependency6__["default"];
+    var TransformWithAsToHash = __dependency7__["default"];
+
+    registerPlugin('ast', TransformWithAsToHash);
+    registerPlugin('ast', TransformEachInToHash);
+
+    __exports__._Ember = _Ember;
+    __exports__.precompile = precompile;
+    __exports__.compile = compile;
+    __exports__.template = template;
+    __exports__.registerPlugin = registerPlugin;
+  });
+enifed("ember-template-compiler/plugins",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-template-compiler
+    */
+
+    /**
+     @private
+     @property helpers
+    */
+    var plugins = {
+      ast: [ ]
+    };
+
+    /**
+      Adds an AST plugin to be used by Ember.HTMLBars.compile.
+
+      @private
+      @method registerASTPlugin
+    */
+    function registerPlugin(type, Plugin) {
+      if (!plugins[type]) {
+        throw new Error('Attempting to register "' + Plugin + '" as "' + type + '" which is not a valid HTMLBars plugin type.');
+      }
+
+      plugins[type].push(Plugin);
+    }
+
+    __exports__.registerPlugin = registerPlugin;__exports__["default"] = plugins;
+  });
+enifed("ember-template-compiler/plugins/transform-each-in-to-hash",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-htmlbars
+    */
+
+
+    /**
+      An HTMLBars AST transformation that replaces all instances of
+
+      ```handlebars
+      {{#each item in items}}
+      {{/each}}
+      ```
+
+      with
+
+      ```handlebars
+      {{#each items keyword="item"}}
+      {{/each}}
+      ```
+
+      @class TransformEachInToHash
+      @private
+    */
+    function TransformEachInToHash() {
+      // set later within HTMLBars to the syntax package
+      this.syntax = null;
+    }
+
+    /**
+      @private
+      @method transform
+      @param {AST} The AST to be transformed.
+    */
+    TransformEachInToHash.prototype.transform = function TransformEachInToHash_transform(ast) {
+      var pluginContext = this;
+      var walker = new pluginContext.syntax.Walker();
+      var b = pluginContext.syntax.builders;
+
+      walker.visit(ast, function(node) {
+        if (pluginContext.validate(node)) {
+          var removedParams = node.sexpr.params.splice(0, 2);
+          var keyword = removedParams[0].original;
+
+          // TODO: This may not be necessary.
+          if (!node.sexpr.hash) {
+            node.sexpr.hash = b.hash();
+          }
+
+          node.sexpr.hash.pairs.push(b.pair(
+            'keyword',
+            b.string(keyword)
+          ));
+        }
+      });
+
+      return ast;
+    };
+
+    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';
+    };
+
+    __exports__["default"] = TransformEachInToHash;
+  });
+enifed("ember-template-compiler/plugins/transform-with-as-to-hash",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-htmlbars
+    */
+
+    /**
+      An HTMLBars AST transformation that replaces all instances of
+
+      ```handlebars
+      {{#with foo.bar as bar}}
+      {{/with}}
+      ```
+
+      with
+
+      ```handlebars
+      {{#with foo.bar as |bar|}}
+      {{/with}}
+      ```
+
+      @private
+      @class TransformWithAsToHash
+    */
+    function TransformWithAsToHash() {
+      // set later within HTMLBars to the syntax package
+      this.syntax = null;
+    }
+
+    /**
+      @private
+      @method transform
+      @param {AST} The AST to be transformed.
+    */
+    TransformWithAsToHash.prototype.transform = function TransformWithAsToHash_transform(ast) {
+      var pluginContext = this;
+      var walker = new pluginContext.syntax.Walker();
+
+      walker.visit(ast, function(node) {
+        if (pluginContext.validate(node)) {
+          var removedParams = node.sexpr.params.splice(1, 2);
+          var keyword = removedParams[1].original;
+          node.program.blockParams = [ keyword ];
+        }
+      });
+
+      return ast;
+    };
+
+    TransformWithAsToHash.prototype.validate = function TransformWithAsToHash_validate(node) {
+      return node.type === 'BlockStatement' &&
+        node.sexpr.path.original === 'with' &&
+        node.sexpr.params.length === 3 &&
+        node.sexpr.params[1].type === 'PathExpression' &&
+        node.sexpr.params[1].original === 'as';
+    };
+
+    __exports__["default"] = TransformWithAsToHash;
+  });
+enifed("ember-template-compiler/system/compile",
+  ["htmlbars-compiler/compiler","ember-template-compiler/system/compile_options","ember-template-compiler/system/template","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-template-compiler
+    */
+
+    var compile = __dependency1__.compile;
+    var compileOptions = __dependency2__["default"];
+    var template = __dependency3__["default"];
+
+    /**
+      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.
+    */
+    __exports__["default"] = function(templateString) {
+      var templateSpec = compile(templateString, compileOptions());
+
+      return template(templateSpec);
+    }
+  });
+enifed("ember-template-compiler/system/compile_options",
+  ["ember-metal/core","ember-template-compiler/plugins","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-template-compiler
+    */
+
+    var Ember = __dependency1__["default"];
+    var plugins = __dependency2__["default"];
+
+    /**
+      @private
+      @property compileOptions
+    */
+    __exports__["default"] = function() {
+      var disableComponentGeneration = true;
+      
+      return {
+        disableComponentGeneration: disableComponentGeneration,
+
+        plugins: plugins
+      };
+    }
+  });
+enifed("ember-template-compiler/system/precompile",
+  ["htmlbars-compiler/compiler","ember-template-compiler/system/compile_options","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-template-compiler
+    */
+
+    var compileSpec = __dependency1__.compileSpec;
+    var compileOptions = __dependency2__["default"];
+
+    /**
+      Uses HTMLBars `compile` function to process a string into a compiled template string.
+      The returned string must be passed through `Ember.HTMLBars.template`.
+
+      This is not present in production builds.
+
+      @private
+      @method precompile
+      @param {String} templateString This is the string to be compiled by HTMLBars.
+    */
+    __exports__["default"] = function(templateString) {
+      return compileSpec(templateString, compileOptions());
+    }
+  });
+enifed("ember-template-compiler/system/template",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-template-compiler
+    */
+
+    /**
+      Augments the detault precompiled output of an HTMLBars template with
+      additional information needed by Ember.
+
+      @private
+      @method template
+      @param {Function} templateSpec This is the compiled HTMLBars template spec.
+    */
+
+    __exports__["default"] = function(templateSpec) {
+      templateSpec.isTop = true;
+      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(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
@@ -38585,6 +38766,151 @@ enifed("ember-views/mixins/view_target_action_support",
       actionContext: alias('context')
     });
   });
+enifed("ember-views/streams/class_name_binding",
+  ["ember-metal/streams/utils","ember-metal/property_get","ember-runtime/system/string","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var chainStream = __dependency1__.chainStream;
+    var read = __dependency1__.read;
+    var get = __dependency2__.get;
+    var dasherize = __dependency3__.dasherize;
+    var isArray = __dependency4__.isArray;
+
+    /**
+      Parse a path and return an object which holds the parsed properties.
+
+      For example a path like "content.isEnabled:enabled:disabled" will return the
+      following object:
+
+      ```javascript
+      {
+        path: "content.isEnabled",
+        className: "enabled",
+        falsyClassName: "disabled",
+        classNames: ":enabled:disabled"
+      }
+      ```
+
+      @method parsePropertyPath
+      @static
+      @private
+    */
+    function parsePropertyPath(path) {
+      var split = path.split(':');
+      var propertyPath = split[0];
+      var classNames = "";
+      var className, falsyClassName;
+
+      // check if the property is defined as prop:class or prop:trueClass:falseClass
+      if (split.length > 1) {
+        className = split[1];
+        if (split.length === 3) {
+          falsyClassName = split[2];
+        }
+
+        classNames = ':' + className;
+        if (falsyClassName) {
+          classNames += ":" + falsyClassName;
+        }
+      }
+
+      return {
+        path: propertyPath,
+        classNames: classNames,
+        className: (className === '') ? undefined : className,
+        falsyClassName: falsyClassName
+      };
+    }
+
+    __exports__.parsePropertyPath = parsePropertyPath;/**
+      Get the class name for a given value, based on the path, optional
+      `className` and optional `falsyClassName`.
+
+      - if a `className` or `falsyClassName` has been specified:
+        - if the value is truthy and `className` has been specified,
+          `className` is returned
+        - if the value is falsy and `falsyClassName` has been specified,
+          `falsyClassName` is returned
+        - otherwise `null` is returned
+      - if the value is `true`, the dasherized last part of the supplied path
+        is returned
+      - if the value is not `false`, `undefined` or `null`, the `value`
+        is returned
+      - if none of the above rules apply, `null` is returned
+
+      @method classStringForValue
+      @param path
+      @param val
+      @param className
+      @param falsyClassName
+      @static
+      @private
+    */
+    function classStringForValue(path, val, className, falsyClassName) {
+      if(isArray(val)) {
+        val = get(val, 'length') !== 0;
+      }
+
+      // When using the colon syntax, evaluate the truthiness or falsiness
+      // of the value to determine which className to return
+      if (className || falsyClassName) {
+        if (className && !!val) {
+          return className;
+
+        } else if (falsyClassName && !val) {
+          return falsyClassName;
+
+        } else {
+          return null;
+        }
+
+      // If value is a Boolean and true, return the dasherized property
+      // name.
+      } else if (val === true) {
+        // Normalize property path to be suitable for use
+        // as a class name. For exaple, content.foo.barBaz
+        // becomes bar-baz.
+        var parts = path.split('.');
+        return dasherize(parts[parts.length-1]);
+
+      // If the value is not false, undefined, or null, return the current
+      // value of the property.
+      } else if (val !== false && val != null) {
+        return val;
+
+      // Nothing to display. Return null so that the old class is removed
+      // but no new class is added.
+      } else {
+        return null;
+      }
+    }
+
+    __exports__.classStringForValue = classStringForValue;function streamifyClassNameBinding(view, classNameBinding, prefix){
+      prefix = prefix || '';
+      Ember.assert("classNameBindings must not have spaces in them. Multiple class name bindings can be provided as elements of an array, e.g. ['foo', ':bar']", classNameBinding.indexOf(' ') === -1);
+      var parsedPath = parsePropertyPath(classNameBinding);
+      if (parsedPath.path === '') {
+        return classStringForValue(
+          parsedPath.path,
+          true,
+          parsedPath.className,
+          parsedPath.falsyClassName
+        );
+      } else {
+        var pathValue = view.getStream(prefix+parsedPath.path);
+        return chainStream(pathValue, function(){
+          return classStringForValue(
+            parsedPath.path,
+            read(pathValue),
+            parsedPath.className,
+            parsedPath.falsyClassName
+          );
+        });
+      }
+    }
+
+    __exports__.streamifyClassNameBinding = streamifyClassNameBinding;
+  });
 enifed("ember-views/streams/conditional_stream",
   ["ember-metal/streams/stream","ember-metal/streams/utils","ember-metal/platform","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
@@ -38695,6 +39021,7 @@ enifed("ember-views/streams/key_stream",
     var removeObserver = __dependency6__.removeObserver;
     var Stream = __dependency7__["default"];
     var read = __dependency8__.read;
+    var isStream = __dependency8__.isStream;
 
     function KeyStream(source, key) {
       Ember.assert("KeyStream error: key must be a non-empty string", typeof key === 'string' && key.length > 0);
@@ -38705,7 +39032,7 @@ enifed("ember-views/streams/key_stream",
       this.obj = undefined;
       this.key = key;
 
-      if (source && source.isStream) {
+      if (isStream(source)) {
         source.subscribe(this._didChange, this);
       }
     }
@@ -38746,11 +39073,11 @@ enifed("ember-views/streams/key_stream",
         var prevSource = this.source;
 
         if (nextSource !== prevSource) {
-          if (prevSource && prevSource.isStream) {
+          if (isStream(prevSource)) {
             prevSource.unsubscribe(this._didChange, this);
           }
 
-          if (nextSource && nextSource.isStream) {
+          if (isStream(nextSource)) {
             nextSource.subscribe(this._didChange, this);
           }
 
@@ -38767,7 +39094,7 @@ enifed("ember-views/streams/key_stream",
 
       destroy: function() {
         if (this._super$destroy()) {
-          if (this.source && this.source.isStream) {
+          if (isStream(this.source)) {
             this.source.unsubscribe(this._didChange, this);
           }
 
@@ -38800,6 +39127,7 @@ enifed("ember-views/streams/utils",
     var isGlobal = __dependency3__.isGlobal;
     var fmt = __dependency4__.fmt;
     var read = __dependency5__.read;
+    var isStream = __dependency5__.isStream;
     var View = __dependency6__["default"];
     var ControllerMixin = __dependency7__["default"];
 
@@ -38819,13 +39147,13 @@ enifed("ember-views/streams/utils",
         viewClass = value;
       }
 
-      Ember.assert(fmt(value+" must be a subclass of Ember.View, not %@", [viewClass]), View.detect(viewClass));
+      Ember.assert(fmt(value+" must be a subclass or an instance of Ember.View, not %@", [viewClass]), View.detect(viewClass) || View.detectInstance(viewClass));
 
       return viewClass;
     }
 
     __exports__.readViewFactory = readViewFactory;function readUnwrappedModel(object) {
-      if (object && object.isStream) {
+      if (isStream(object)) {
         var result = object.value();
 
         // If the path is exactly `controller` then we don't unwrap it.
@@ -39498,15 +39826,15 @@ enifed("ember-views/system/render_buffer",
         @chainable
       */
       push: function(content) {
-        if (content.nodeType) {
-          Ember.assert("A fragment cannot be pushed into a buffer that contains content", !this.buffer);
-          this.buffer = content;
-        } else {
+        if (typeof content === 'string') {
           if (this.buffer === null) {
             this.buffer = '';
           }
           Ember.assert("A string cannot be pushed into the buffer after a fragment", !this.buffer.nodeType);
           this.buffer += content;
+        } else {
+          Ember.assert("A fragment cannot be pushed into a buffer that contains content", !this.buffer);
+          this.buffer = content;
         }
         return this;
       },
@@ -39654,7 +39982,6 @@ enifed("ember-views/system/render_buffer",
         }
 
         var element = this.dom.createElement(tagString, this.outerContextualElement());
-        var $element = jQuery(element);
 
         if (id) {
           this.dom.setAttribute(element, 'id', id);
@@ -39668,9 +39995,7 @@ enifed("ember-views/system/render_buffer",
 
         if (style) {
           for (prop in style) {
-            if (style.hasOwnProperty(prop)) {
-              styleBuffer += (prop + ':' + style[prop] + ';');
-            }
+            styleBuffer += (prop + ':' + style[prop] + ';');
           }
 
           this.dom.setAttribute(element, 'style', styleBuffer);
@@ -39680,9 +40005,7 @@ enifed("ember-views/system/render_buffer",
 
         if (attrs) {
           for (attr in attrs) {
-            if (attrs.hasOwnProperty(attr)) {
-              this.dom.setAttribute(element, attr, attrs[attr]);
-            }
+            this.dom.setAttribute(element, attr, attrs[attr]);
           }
 
           this.elementAttributes = null;
@@ -39690,9 +40013,7 @@ enifed("ember-views/system/render_buffer",
 
         if (props) {
           for (prop in props) {
-            if (props.hasOwnProperty(prop)) {
-              $element.prop(prop, props[prop]);
-            }
+            this.dom.setProperty(element, prop, props[prop]);
           }
 
           this.elementProperties = null;
@@ -39730,7 +40051,10 @@ enifed("ember-views/system/render_buffer",
             this._element.appendChild(nodes[0]);
           }
         }
-        this.hydrateMorphs(contextualElement);
+        // This should only happen with legacy string buffers
+        if (this.childViews.length > 0) {
+          this.hydrateMorphs(contextualElement);
+        }
 
         return this._element;
       },
@@ -39793,8 +40117,8 @@ enifed("ember-views/system/render_buffer",
     };
   });
 enifed("ember-views/system/renderer",
-  ["ember-metal/core","ember-metal-views/renderer","ember-metal/platform","ember-views/system/render_buffer","ember-metal/run_loop","ember-metal/property_set","ember-metal/instrumentation","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+  ["ember-metal/core","ember-metal-views/renderer","ember-metal/platform","ember-views/system/render_buffer","ember-metal/run_loop","ember-metal/property_set","ember-metal/property_get","ember-metal/instrumentation","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var Renderer = __dependency2__["default"];
@@ -39802,8 +40126,9 @@ enifed("ember-views/system/renderer",
     var renderBuffer = __dependency4__["default"];
     var run = __dependency5__["default"];
     var set = __dependency6__.set;
-    var _instrumentStart = __dependency7__._instrumentStart;
-    var subscribers = __dependency7__.subscribers;
+    var get = __dependency7__.get;
+    var _instrumentStart = __dependency8__._instrumentStart;
+    var subscribers = __dependency8__.subscribers;
 
     function EmberRenderer() {
       this.buffer = renderBuffer();
@@ -39831,8 +40156,12 @@ enifed("ember-views/system/renderer",
         // provided buffer operation (for example, `insertAfter` will
         // insert a new buffer after the "parent buffer").
         var tagName = view.tagName;
+        if (tagName === undefined) {
+          tagName = get(view, 'tagName');
+          Ember.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.length > 0;
+        var taglessViewWithClassBindings = tagName === '' && (classNameBindings && classNameBindings.length > 0);
 
         if (tagName === null || tagName === undefined) {
           tagName = 'div';
@@ -39866,9 +40195,7 @@ enifed("ember-views/system/renderer",
 
         view.buffer = null;
         if (element && element.nodeType === 1) {
-          // We have hooks, we shouldn't make element observable
-          // consider just doing view.element = element
-          set(view, 'element', element);
+          view.element = element;
         }
         return element;
       };
@@ -39928,6 +40255,60 @@ enifed("ember-views/system/renderer",
 
     __exports__["default"] = EmberRenderer;
   });
+enifed("ember-views/system/sanitize_attribute_value",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /* jshint scripturl:true */
+
+    var parsingNode;
+    var badProtocols = {
+      'javascript:': true,
+      'vbscript:': true
+    };
+
+    var badTags = {
+      'A': true,
+      'BODY': true,
+      'LINK': true,
+      'IMG': true,
+      'IFRAME': true
+    };
+
+    var badAttributes = {
+      'href': true,
+      'src': true,
+      'background': true
+    };
+    __exports__.badAttributes = badAttributes;
+    __exports__["default"] = function sanitizeAttributeValue(element, attribute, value) {
+      var tagName;
+
+      if (!parsingNode) {
+        parsingNode = document.createElement('a');
+      }
+
+      if (!element) {
+        tagName = null;
+      } else {
+        tagName = element.tagName;
+      }
+
+      if (value && value.toHTML) {
+        return value.toHTML();
+      }
+
+      if ((tagName === null || badTags[tagName]) && badAttributes[attribute]) {
+        parsingNode.href = value;
+
+        if (badProtocols[parsingNode.protocol] === true) {
+          return 'unsafe:' + value;
+        }
+      }
+
+      return value;
+    }
+  });
 enifed("ember-views/system/utils",
   ["exports"],
   function(__exports__) {
@@ -40709,8 +41090,8 @@ enifed("ember-views/views/collection_view",
     __exports__["default"] = CollectionView;
   });
 enifed("ember-views/views/component",
-  ["ember-metal/core","ember-views/mixins/component_template_deprecation","ember-runtime/mixins/target_action_support","ember-views/views/view","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/computed","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+  ["ember-metal/core","ember-views/mixins/component_template_deprecation","ember-runtime/mixins/target_action_support","ember-views/views/view","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/computed","ember-htmlbars/templates/component","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert, Ember.Handlebars
@@ -40724,6 +41105,7 @@ enifed("ember-views/views/component",
     var isNone = __dependency7__["default"];
 
     var computed = __dependency8__.computed;
+    var defaultComponentLayout = __dependency9__["default"];
 
     var a_slice = Array.prototype.slice;
 
@@ -40831,12 +41213,7 @@ enifed("ember-views/views/component",
         set(this, 'controller', this);
       },
 
-      defaultLayout: function(context, options){
-        
-          // ES6TODO: must use global here, to prevent circular require issue
-          // remove and replace with standard import once we have lazy binding
-          Ember.HTMLBars.helpers.yield.helperFunction.call(context, [], {}, options, { data: { view: context }});
-              },
+      defaultLayout: defaultComponentLayout,
 
       /**
       A components template property is set by passing a block
@@ -41501,7 +41878,8 @@ enifed("ember-views/views/core_view",
 
       init: function() {
         this._super();
-        this._transitionTo('preRender');
+        this._state = 'preRender';
+        this.currentState = this._states.preRender;
         this._isVisible = get(this, 'isVisible');
       },
 
@@ -42460,6 +42838,7 @@ enifed("ember-views/views/simple_bound_view",
     SimpleBoundView.prototype = {
       isVirtual: true,
       isView: true,
+      tagName: '',
 
       destroy: function () {
         if (this.updateId) {
@@ -42818,8 +43197,10 @@ enifed("ember-views/views/states/in_dom",
           View.views[view.elementId] = view;
         }
 
-        addBeforeObserver(view, 'elementId', function() {
-          throw new EmberError("Changing a view's elementId after creation is not allowed");
+        Ember.runInDebug(function() {
+          addBeforeObserver(view, 'elementId', function() {
+            throw new EmberError("Changing a view's elementId after creation is not allowed");
+          });
         });
       },
 
@@ -43031,8 +43412,8 @@ enifed("ember-views/views/text_field",
     });
   });
 enifed("ember-views/views/view",
-  ["ember-metal/core","ember-metal/platform","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/streams/simple","ember-views/streams/key_stream","ember-metal/streams/stream_binding","ember-views/streams/context_stream","ember-metal/is_none","ember-metal/deprecate_property","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __exports__) {
+  ["ember-metal/core","ember-metal/platform","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/streams/simple","ember-views/streams/key_stream","ember-metal/streams/stream_binding","ember-views/streams/context_stream","ember-metal/is_none","ember-metal/deprecate_property","ember-runtime/system/native_array","ember-views/streams/class_name_binding","ember-metal/enumerable_utils","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","ember-metal/streams/utils","ember-views/system/sanitize_attribute_value","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __exports__) {
     "use strict";
     // Ember.assert, Ember.deprecate, Ember.warn, Ember.TEMPLATES,
     // jQuery, Ember.lookup,
@@ -43060,13 +43441,12 @@ enifed("ember-views/views/view",
     var ContextStream = __dependency18__["default"];
 
     var typeOf = __dependency12__.typeOf;
-    var isArray = __dependency12__.isArray;
     var isNone = __dependency19__["default"];
     var Mixin = __dependency14__.Mixin;
     var deprecateProperty = __dependency20__.deprecateProperty;
     var emberA = __dependency21__.A;
 
-    var dasherize = __dependency22__.dasherize;
+    var streamifyClassNameBinding = __dependency22__.streamifyClassNameBinding;
 
     // ES6TODO: functions on EnumerableUtils should get their own export
     var forEach = __dependency23__.forEach;
@@ -43082,6 +43462,10 @@ enifed("ember-views/views/view",
      // for the side effect of extending Ember.run.queues
 
     var CoreView = __dependency27__["default"];
+    var subscribe = __dependency28__.subscribe;
+    var read = __dependency28__.read;
+    var isStream = __dependency28__.isStream;
+    var sanitizeAttributeValue = __dependency29__["default"];
 
     function K() { return this; }
 
@@ -43796,6 +44180,8 @@ enifed("ember-views/views/view",
         return template || get(this, 'defaultTemplate');
       }),
 
+      _controller: null,
+
       /**
         The controller managing this view. If this property is set, it will be
         made available for use by the template.
@@ -43803,7 +44189,16 @@ enifed("ember-views/views/view",
         @property controller
         @type Object
       */
-      controller: computed('_parentView', function(key) {
+      controller: computed(function(key, value) {
+        if (arguments.length === 2) {
+          this._controller = value;
+          return value;
+        }
+
+        if (this._controller) {
+          return this._controller;
+        }
+
         var parentView = get(this, '_parentView');
         return parentView ? get(parentView, 'controller') : null;
       }),
@@ -43902,7 +44297,11 @@ enifed("ember-views/views/view",
         @property _context
         @private
       */
-      _context: computed(function(key) {
+      _context: computed(function(key, value) {
+        if (arguments.length === 2) {
+          return value;
+        }
+
         var parentView, controller;
 
         if (controller = get(this, 'controller')) {
@@ -44180,18 +44579,11 @@ enifed("ember-views/views/view",
         // ('content.isUrgent')
         forEach(classBindings, function(binding) {
 
-          var parsedPath;
-
-          if (typeof binding === 'string') {
-            Ember.assert("classNameBindings must not have spaces in them. Multiple class name bindings can be provided as elements of an array, e.g. ['foo', ':bar']", binding.indexOf(' ') === -1);
-            parsedPath = View._parsePropertyPath(binding);
-            if (parsedPath.path === '') {
-              parsedPath.stream = new SimpleStream(true);
-            } else {
-              parsedPath.stream = this.getStream('_view.' + parsedPath.path);
-            }
+          var boundBinding;
+          if (isStream(binding)) {
+            boundBinding = binding;
           } else {
-            parsedPath = binding;
+            boundBinding = streamifyClassNameBinding(this, binding, '_view.');
           }
 
           // Variable in which the old class value is saved. The observer function
@@ -44203,8 +44595,8 @@ enifed("ember-views/views/view",
           // class name.
           var observer = this._wrapAsScheduled(function() {
             // Get the current value of the property
-            newClass = this._classStringForProperty(parsedPath);
             elem = this.$();
+            newClass = read(boundBinding);
 
             // If we had previously added a class to the element, remove it.
             if (oldClass) {
@@ -44225,7 +44617,7 @@ enifed("ember-views/views/view",
           });
 
           // Get the class name for the property at its current value
-          dasherizedClass = this._classStringForProperty(parsedPath);
+          dasherizedClass = read(boundBinding);
 
           if (dasherizedClass) {
             // Ensure that it gets into the classNames array
@@ -44238,7 +44630,7 @@ enifed("ember-views/views/view",
             oldClass = dasherizedClass;
           }
 
-          parsedPath.stream.subscribe(observer, this);
+          subscribe(boundBinding, observer, this);
           // Remove className so when the view is rerendered,
           // the className is added based on binding reevaluation
           this.one('willClearRender', function() {
@@ -44433,7 +44825,7 @@ enifed("ember-views/views/view",
       /**
         Replaces the content of the specified parent element with this view's
         element. If the view does not have an HTML representation yet,
-        `createElement()` will be called automatically.
+        the element will be generated automatically.
 
         Note that this method just schedules the view to be appended; the DOM
         element will not be appended to the given element until all bindings have
@@ -44456,8 +44848,8 @@ enifed("ember-views/views/view",
 
       /**
         Appends the view's element to the document body. If the view does
-        not have an HTML representation yet, `createElement()` will be called
-        automatically.
+        not have an HTML representation yet
+        the element will be generated automatically.
 
         If your application uses the `rootElement` property, you must append
         the view within that element. Rendering views outside of the `rootElement`
@@ -44489,6 +44881,22 @@ enifed("ember-views/views/view",
         if (!this.removedFromDOM) { this.destroyElement(); }
       },
 
+      /**
+        The HTML `id` of the view's element in the DOM. You can provide this
+        value yourself but it must be unique (just as in HTML):
+
+        ```handlebars
+          {{my-component elementId="a-really-cool-id"}}
+        ```
+
+        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.
+
+        @property elementId
+        @type String
+      */
       elementId: null,
 
       /**
@@ -44609,7 +45017,7 @@ enifed("ember-views/views/view",
       applyAttributesToBuffer: function(buffer) {
         // Creates observers for all registered class name and attribute bindings,
         // then adds them to the element.
-        var classNameBindings = get(this, 'classNameBindings');
+        var classNameBindings = this.classNameBindings;
         if (classNameBindings.length) {
           this._applyClassNameBindings(classNameBindings);
         }
@@ -44617,7 +45025,7 @@ enifed("ember-views/views/view",
         // Pass the render buffer so the method can apply attributes directly.
         // This isn't needed for class name bindings because they use the
         // existing classNames infrastructure.
-        var attributeBindings = get(this, 'attributeBindings');
+        var attributeBindings = this.attributeBindings;
         if (attributeBindings.length) {
           this._applyAttributeBindings(buffer, attributeBindings);
         }
@@ -45078,7 +45486,7 @@ enifed("ember-views/views/view",
         }
 
         var path = pathOrStream;
-        if (pathOrStream.isStream) {
+        if (isStream(pathOrStream)) {
           path = pathOrStream._label;
 
           if (!path) {
@@ -45165,115 +45573,6 @@ enifed("ember-views/views/view",
       // once the view has been inserted into the DOM, legal manipulations
       // are done on the DOM element.
 
-    View.reopenClass({
-
-      /**
-        Parse a path and return an object which holds the parsed properties.
-
-        For example a path like "content.isEnabled:enabled:disabled" will return the
-        following object:
-
-        ```javascript
-        {
-          path: "content.isEnabled",
-          className: "enabled",
-          falsyClassName: "disabled",
-          classNames: ":enabled:disabled"
-        }
-        ```
-
-        @method _parsePropertyPath
-        @static
-        @private
-      */
-      _parsePropertyPath: function(path) {
-        var split = path.split(':');
-        var propertyPath = split[0];
-        var classNames = "";
-        var className, falsyClassName;
-
-        // check if the property is defined as prop:class or prop:trueClass:falseClass
-        if (split.length > 1) {
-          className = split[1];
-          if (split.length === 3) { falsyClassName = split[2]; }
-
-          classNames = ':' + className;
-          if (falsyClassName) { classNames += ":" + falsyClassName; }
-        }
-
-        return {
-          stream: undefined,
-          path: propertyPath,
-          classNames: classNames,
-          className: (className === '') ? undefined : className,
-          falsyClassName: falsyClassName
-        };
-      },
-
-      /**
-        Get the class name for a given value, based on the path, optional
-        `className` and optional `falsyClassName`.
-
-        - if a `className` or `falsyClassName` has been specified:
-          - if the value is truthy and `className` has been specified,
-            `className` is returned
-          - if the value is falsy and `falsyClassName` has been specified,
-            `falsyClassName` is returned
-          - otherwise `null` is returned
-        - if the value is `true`, the dasherized last part of the supplied path
-          is returned
-        - if the value is not `false`, `undefined` or `null`, the `value`
-          is returned
-        - if none of the above rules apply, `null` is returned
-
-        @method _classStringForValue
-        @param path
-        @param val
-        @param className
-        @param falsyClassName
-        @static
-        @private
-      */
-      _classStringForValue: function(path, val, className, falsyClassName) {
-        if(isArray(val)) {
-          val = get(val, 'length') !== 0;
-        }
-
-        // When using the colon syntax, evaluate the truthiness or falsiness
-        // of the value to determine which className to return
-        if (className || falsyClassName) {
-          if (className && !!val) {
-            return className;
-
-          } else if (falsyClassName && !val) {
-            return falsyClassName;
-
-          } else {
-            return null;
-          }
-
-        // If value is a Boolean and true, return the dasherized property
-        // name.
-        } else if (val === true) {
-          // Normalize property path to be suitable for use
-          // as a class name. For exaple, content.foo.barBaz
-          // becomes bar-baz.
-          var parts = path.split('.');
-          return dasherize(parts[parts.length-1]);
-
-        // If the value is not false, undefined, or null, return the current
-        // value of the property.
-        } else if (val !== false && val != null) {
-          return val;
-
-        // Nothing to display. Return null so that the old class is removed
-        // but no new class is added.
-        } else {
-          return null;
-        }
-      }
-    });
-
     var mutation = EmberObject.extend(Evented).create();
     // TODO MOVE TO RENDERER HOOKS
     View.addMutationListener = function(callback) {
@@ -45305,7 +45604,8 @@ enifed("ember-views/views/view",
     View.childViewsProperty = childViewsProperty;
 
     // Used by Handlebars helpers, view element attributes
-    View.applyAttributeBindings = function(elem, name, value) {
+    View.applyAttributeBindings = function(elem, name, initialValue) {
+      var value = sanitizeAttributeValue(elem[0], name, initialValue);
       var type = typeOf(value);
 
       // if this changes, also change the logic in ember-handlebars/lib/helpers/binding.js
@@ -45352,11 +45652,8 @@ enifed("ember-views/views/with_view",
       init: function() {
         apply(this, this._super, arguments);
 
-        var keywordName     = this.templateHash.keywordName;
         var controllerName  = this.templateHash.controller;
 
-        this._blockArguments = [this.lazyValue];
-
         if (controllerName) {
           var previousContext = this.previousContext;
           var controller = this.container.lookupFactory('controller:'+controllerName).create({
@@ -45367,7 +45664,7 @@ enifed("ember-views/views/with_view",
           this._generatedController = controller;
 
           if (this.preserveContext) {
-            this._keywords[keywordName] = controller;
+            this._blockArguments = [ controller ];
             this.lazyValue.subscribe(function(modelStream) {
               set(controller, 'model', modelStream.value());
             });
@@ -45382,7 +45679,7 @@ enifed("ember-views/views/with_view",
           set(controller, 'model', this.lazyValue.value());
         } else {
           if (this.preserveContext) {
-            this._keywords[keywordName] = this.lazyValue;
+            this._blockArguments = [ this.lazyValue ];
           }
         }
       },
@@ -48227,8 +48524,8 @@ enifed("htmlbars-syntax/node-handlers",
     __exports__["default"] = nodeHandlers;
   });
 enifed("htmlbars-syntax/parser",
-  ["./handlebars/compiler/base","../simple-html-tokenizer","../simple-html-tokenizer/entity-parser","../simple-html-tokenizer/char-refs/full","./node-handlers","./token-handlers","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+  ["./handlebars/compiler/base","../simple-html-tokenizer","../simple-html-tokenizer/entity-parser","../simple-html-tokenizer/char-refs/full","./node-handlers","./token-handlers","../htmlbars-syntax","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     var parse = __dependency1__.parse;
     var Tokenizer = __dependency2__.Tokenizer;
@@ -48237,13 +48534,23 @@ enifed("htmlbars-syntax/parser",
     var nodeHandlers = __dependency5__["default"];
     var tokenHandlers = __dependency6__["default"];
 
+    // this should be:
+    // `import * from "../htmlbars-syntax";
+    //
+    // But this version of the transpiler does not support it properly
+    var syntax = __dependency7__;
+
     function preprocess(html, options) {
       var ast = (typeof html === 'object') ? html : parse(html);
       var combined = new HTMLProcessor(html, options).acceptNode(ast);
 
       if (options && options.plugins && options.plugins.ast) {
         for (var i = 0, l = options.plugins.ast.length; i < l; i++) {
-          combined = options.plugins.ast[i](combined);
+          var plugin = new options.plugins.ast[i]();
+
+          plugin.syntax = syntax;
+
+          combined = plugin.transform(combined);
         }
       }
 
@@ -48399,19 +48706,39 @@ enifed("htmlbars-syntax/token-handlers",
         var token = this.tokenizer.token;
 
         switch(state) {
+          // Tag helpers
+          case "tagName":
+            token.addTagHelper(mustache.sexpr);
+            this.tokenizer.state = "beforeAttributeName";
+            return;
+          case "beforeAttributeName":
+            token.addTagHelper(mustache.sexpr);
+            return;
+          case "attributeName":
+          case "afterAttributeName":
+            this.tokenizer.finalizeAttributeValue();
+            token.addTagHelper(mustache.sexpr);
+            this.tokenizer.state = "beforeAttributeName";
+            return;
+          case "afterAttributeValueQuoted":
+            token.addTagHelper(mustache.sexpr);
+            this.tokenizer.state = "beforeAttributeName";
+            return;
+
+          // Attribute values
           case "beforeAttributeValue":
-            this.tokenizer.state = 'attributeValueUnquoted';
             token.markAttributeQuoted(false);
             token.addToAttributeValue(mustache);
+            this.tokenizer.state = 'attributeValueUnquoted';
             return;
           case "attributeValueDoubleQuoted":
           case "attributeValueSingleQuoted":
           case "attributeValueUnquoted":
             token.addToAttributeValue(mustache);
             return;
-          case "beforeAttributeName":
-            token.addTagHelper(mustache.sexpr);
-            return;
+
+          // TODO: Only append child when the tokenizer state makes
+          // sense to do so, otherwise throw an error.
           default:
             appendChild(this.currentElement(), mustache);
         }
@@ -49091,6 +49418,10 @@ enifed("morph/dom-helper",
     var prototype = DOMHelper.prototype;
     prototype.constructor = DOMHelper;
 
+    prototype.getElementById = function(id) {
+      return this.document.getElementById(id);
+    };
+
     prototype.insertBefore = function(element, childElement, referenceChild) {
       return element.insertBefore(childElement, referenceChild);
     };