embient 0.0.8 → 0.0.9

data/vendor/assets/javascripts/embient/ember-routemanager.js

@@ -42,7 +42,7 @@ Ember.RouteManager = Ember.StateManager.extend({
 
    You will also need to make sure that baseURI is properly configured, as
    well as your server so that your routes are properly pointing to your
-   SproutCore application.
+   Ember application.
 
    @see http://dev.w3.org/html5/spec/history.html#the-history-interface
    @property
@@ -193,13 +193,12 @@ Ember.RouteManager = Ember.StateManager.extend({
   },
 
   /**
-   You usually don't need to call this method. It is done automatically after
-   the application has been initialized.
-
-   It registers for the hashchange event if available. If not, it creates a
+   Start this routemanager.
+   
+   Registers for the hashchange event if available. If not, it creates a
    timer that looks for location changes every 150ms.
    */
-  ping: function() {
+  start: function() {
     if(!this._didSetup) {
       this._didSetup = true;
       var state;
@@ -250,8 +249,11 @@ Ember.RouteManager = Ember.StateManager.extend({
       }
     }
   },
-
-  destroy: function() {
+  
+  /**
+   Stop this routemanager
+   */
+  stop: function() {
     if(this._didSetup) {
       if(get(this, 'wantsHistory') && supportsHistory) {
         jQuery(window).unbind('popstate', this.popState);
@@ -262,19 +264,13 @@ Ember.RouteManager = Ember.StateManager.extend({
           clearTimeout(this._timerId);
         }
       }
+      this._didSetup = false;
     }
-    this._super();
   },
 
-  /**
-   Ember.RouteManager currently automatically starts listening
-   for browser location changes when created.
-   */
-  init: function() {
+  destroy: function() {
+    this.stop();
     this._super();
-    if(!this._didSetup) {
-      this.ping();
-    }
   },
 
   /**

data/vendor/assets/javascripts/embient/ember.js

@@ -1,4 +1,4 @@
-(function(exports) {
+(function() {
 /*global __fail__*/
 /**
   Define an assertion that will throw an exception if the condition is not
@@ -31,7 +31,7 @@
     will be executed.  If the function returns false an exception will be
     thrown.
 */
-window.ember_assert = window.sc_assert = function ember_assert(desc, test) {
+window.ember_assert = function ember_assert(desc, test) {
   if ('function' === typeof test) test = test()!==false;
   if (!test) throw new Error("assertion failed: "+desc);
 };
@@ -126,9 +126,9 @@ window.ember_deprecateFunc = function(message, func) {
   };
 };
 
-})({});
+})();
 
-(function(exports) {
+(function() {
 // lib/handlebars/base.js
 var Handlebars = {};
 
@@ -367,7 +367,7 @@ parse: function parse(input) {
 
     var symbol, preErrorSymbol, state, action, a, r, yyval={},p,len,newState, expected;
     while (true) {
-        // retreive state number from top of stack
+        // retrieve state number from top of stack
         state = stack[stack.length-1];
 
         // use default actions if available
@@ -1723,9 +1723,9 @@ Handlebars.template = Handlebars.VM.template;
 ;
 
 
-})({});
+})();
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Metal
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -1737,7 +1737,7 @@ if ('undefined' === typeof Ember) {
 /**
   @namespace
   @name Ember
-  @version 0.9.5
+  @version 0.9.6
 
   All Ember methods and functions are defined inside of this namespace.
   You generally should not add new properties to this namespace as it may be
@@ -1769,10 +1769,10 @@ if ('undefined' !== typeof window) {
 /**
   @static
   @type String
-  @default '0.9.5'
+  @default '0.9.6'
   @constant
 */
-Ember.VERSION = '0.9.5';
+Ember.VERSION = '0.9.6';
 
 /**
   @static
@@ -1861,9 +1861,11 @@ if ('undefined' === typeof ember_deprecateFunc) {
 */
 Ember.Logger = window.console || { log: Ember.K, warn: Ember.K, error: Ember.K };
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Metal
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -2015,9 +2017,11 @@ if (!platform.defineProperty) {
   platform.defineProperty.isSimulated = true;
 }
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Metal
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -2318,8 +2322,6 @@ Ember.wrap = function(func, superFunc) {
 };
 
 /**
-  @function
-
   Returns true if the passed object is an array or Array-like.
 
   Ember Array Protocol:
@@ -2331,6 +2333,11 @@ Ember.wrap = function(func, superFunc) {
   Unlike Ember.typeOf this method returns true even if the passed object is
   not formally array but appears to be array-like (i.e. implements Ember.Array)
 
+      Ember.isArray(); // false
+      Ember.isArray([]); // true
+      Ember.isArray( Ember.ArrayProxy.create({ content: [] }) ); // true
+
+  @name Ember.isArray
   @param {Object} obj The object to test
   @returns {Boolean}
 */
@@ -2347,6 +2354,15 @@ Ember.isArray = function(obj) {
   an array or array-like, returns the object.  Otherwise adds the object to
   an array.  If obj is null or undefined, returns an empty array.
 
+      Ember.makeArray();          => []
+      Ember.makeArray(null);      => []
+      Ember.makeArray(undefined); => []
+      Ember.makeArray('lindsay'); => ['lindsay'] 
+      Ember.makeArray([1,2,42]);  => [1,2,42]
+
+      var controller = Ember.ArrayProxy.create({ content: [] });
+      Ember.makeArray(controller) === controller;   => true
+
   @param {Object} obj the object
   @returns {Array}
 */
@@ -2357,9 +2373,11 @@ Ember.makeArray = function(obj) {
 
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Metal
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -2746,9 +2764,11 @@ Ember.isGlobalPath = function(path) {
   return !HAS_THIS.test(path) && IS_GLOBAL.test(path);
 };
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Metal
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -3108,7 +3128,7 @@ Ember.defineProperty = function(obj, keyName, desc, val) {
   that support it, this uses the built in Object.create method.  Else one is
   simulated for you.
 
-  This method is a better choice thant Object.create() because it will make
+  This method is a better choice than Object.create() because it will make
   sure that any observers, event listeners, and computed properties are
   inherited from the parent as well.
 
@@ -3157,9 +3177,11 @@ Ember.createPrototype = function(obj, props) {
   return ret;
 };
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Metal
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -3499,9 +3521,30 @@ Ember.computed = function(func) {
   return cp;
 };
 
-})({});
+/**
+  Returns the cached value for a property, if one exists.
+  This can be useful for peeking at the value of a computed
+  property that is generated lazily, without accidentally causing
+  it to be created.
+
+  @param {Object} obj the object whose property you want to check
+  @param {String} key the name of the property whose cached value you want
+                      to return
+
+*/
+Ember.cacheFor = function(obj, key) {
+  var cache = meta(obj, false).cache;
+
+  if (cache && cache[key]) {
+    return cache[key];
+  }
+};
+
+})();
+
 
-(function(exports) {
+
+(function() {
 /*jshint newcap:false*/
 
 // NOTE: There is a bug in jshint that doesn't recognize `Object()` without `new`
@@ -3592,6 +3635,13 @@ Ember.ArrayUtils = {
     return obj.indexOf ? obj.indexOf.apply(obj, args) : arrayIndexOf.apply(obj, args);
   },
 
+  indexesOf: function(obj) {
+    var args = Array.prototype.slice.call(arguments, 1);
+    return args[0] === undefined ? [] : Ember.ArrayUtils.map(args[0], function(item) {
+      return Ember.ArrayUtils.indexOf(obj, item);
+    });
+  },
+
   removeObject: function(array, item) {
     var index = this.indexOf(array, item);
     if (index !== -1) { array.splice(index, 1); }
@@ -3616,9 +3666,11 @@ if (Ember.SHIM_ES5) {
   }
 }
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Metal
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -3870,9 +3922,11 @@ Ember.notifyBeforeObservers = function(obj, keyName) {
 };
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Metal
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -4482,9 +4536,11 @@ Ember.destroy = function (obj) {
   }
 };
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Metal
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -4698,6 +4754,7 @@ function sendEvent(obj, eventName) {
   return true;
 }
 
+/** @memberOf Ember */
 function deferEvent(obj, eventName) {
   var targetSet = targetSetFor(obj, eventName), actions = [], params = arguments;
   iterateSet(targetSet, function (action) {
@@ -4746,9 +4803,11 @@ Ember.hasListeners = hasListeners;
 Ember.watchedEvents = watchedEvents;
 Ember.listenersFor = listenersFor;
 Ember.deferEvent = deferEvent;
-})({});
+})();
 
-(function(exports) {
+
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -5179,14 +5238,17 @@ function findNamespaces() {
     //  get(window.globalStorage, 'isNamespace') would try to read the storage for domain isNamespace and cause exception in Firefox.
     // globalStorage is a storage obsoleted by the WhatWG storage specification. See https://developer.mozilla.org/en/DOM/Storage#globalStorage
     if (prop === "globalStorage" && window.StorageList && window.globalStorage instanceof window.StorageList) { continue; }
-    // Don't access properties on parent window, which will throw "Access/Permission Denied" in IE/Firefox for windows on different domains
-    if (prop === "parent" || prop === "top" || prop === "frameElement" || prop === "content") { continue; }
     // Unfortunately, some versions of IE don't support window.hasOwnProperty
     if (window.hasOwnProperty && !window.hasOwnProperty(prop)) { continue; }
 
-    obj = window[prop];
+    try {
+      obj = window[prop];
+    } catch (e) {
+      continue;
+    }
 
     if (obj && get(obj, 'isNamespace')) {
+      ember_deprecate("Namespaces should not begin with lowercase.", /^[A-Z]/.test(prop));
       obj[NAME_KEY] = prop;
     }
   }
@@ -5305,9 +5367,11 @@ Ember.beforeObserver = function(func) {
 
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -5425,7 +5489,7 @@ RunLoop.prototype = {
       while (this._queues && (queue = this._queues[queueName])) {
         this._queues[queueName] = null;
 
-        // the sync phase is to allow property changes to propogate.  don't
+        // the sync phase is to allow property changes to propagate.  don't
         // invoke observers until that is finished.
         if (queueName === 'sync') {
           log = Ember.LOG_BINDINGS;
@@ -5455,7 +5519,7 @@ RunLoop.prototype = {
           queue = queues[queueName];
 
           if (queue) {
-            // the sync phase is to allow property changes to propogate.  don't
+            // the sync phase is to allow property changes to propagate.  don't
             // invoke observers until that is finished.
             if (queueName === 'sync') {
               log = Ember.LOG_BINDINGS;
@@ -5489,9 +5553,14 @@ Ember.RunLoop = RunLoop;
 // ..........................................................
 // Ember.run - this is ideally the only public API the dev sees
 //
+/** 
+* @namespace Ember.run is both a function and a namespace for
+* RunLoop-related functions.
+* @name Ember.run
+*/ 
 
 /**
-  Runs the passed target and method inside of a runloop, ensuring any
+  Runs the passed target and method inside of a RunLoop, ensuring any
   deferred actions including bindings and views updates are flushed at the
   end.
 
@@ -5500,7 +5569,12 @@ Ember.RunLoop = RunLoop;
   libraries or plugins, you should probably wrap all of your code inside this
   call.
 
-  @function
+      Ember.run(function(){
+        // code to be execute within a RunLoop 
+      });
+
+  @name run^2
+  @methodOf Ember.run
   @param {Object} target
     (Optional) target of method to call
 
@@ -5534,6 +5608,11 @@ var run = Ember.run;
   be buffered until you invoke a matching call to Ember.run.end().  This is
   an lower-level way to use a RunLoop instead of using Ember.run().
 
+      Ember.run.begin();
+      // code to be execute within a RunLoop 
+      Ember.run.end();
+
+
   @returns {void}
 */
 Ember.run.begin = function() {
@@ -5545,6 +5624,10 @@ Ember.run.begin = function() {
   to flush any deferred actions.  This is a lower-level way to use a RunLoop
   instead of using Ember.run().
 
+      Ember.run.begin();
+      // code to be execute within a RunLoop 
+      Ember.run.end();
+
   @returns {void}
 */
 Ember.run.end = function() {
@@ -5564,6 +5647,7 @@ Ember.run.end = function() {
   to inspect or modify this property.
 
   @property {String}
+  @default ['sync', 'actions', 'destroy', 'timers']
 */
 Ember.run.queues = ['sync', 'actions', 'destroy', 'timers'];
 
@@ -5577,6 +5661,18 @@ Ember.run.queues = ['sync', 'actions', 'destroy', 'timers'];
   Methods will be invoked in an order matching the named queues defined in
   the run.queues property.
 
+      Ember.run.schedule('timers', this, function(){
+        // this will be executed at the end of the RunLoop, when timers are run
+        console.log("scheduled on timers queue");
+      });
+      Ember.run.schedule('sync', this, function(){
+        // this will be executed at the end of the RunLoop, when bindings are synced
+        console.log("scheduled on sync queue");
+      });
+      // Note the functions will be run in order based on the run queues order. Output would be:
+      //   scheduled on sync queue
+      //   scheduled on timers queue
+
   @param {String} queue
     The name of the queue to schedule against.  Default queues are 'sync' and
     'actions'
@@ -5613,6 +5709,8 @@ function autorun() {
   ensure the RunLoop always finishes.  You normally do not need to call this
   method directly.  Instead use Ember.run().
 
+      Ember.run.autorun();
+
   @returns {Ember.RunLoop} the new current RunLoop
 */
 Ember.run.autorun = function() {
@@ -5636,9 +5734,11 @@ Ember.run.autorun = function() {
   use this queue so this method is a useful way to immediately force all
   bindings in the application to sync.
 
-  You should call this method anytime you need any changed state to propogate
+  You should call this method anytime you need any changed state to propagate
   throughout the app immediately without repainting the UI.
 
+      Ember.run.sync();
+
   @returns {void}
 */
 Ember.run.sync = function() {
@@ -5679,10 +5779,14 @@ function invokeLaterTimers() {
   of milliseconds.
 
   You should use this method whenever you need to run some action after a
-  period of time inside of using setTimeout().  This method will ensure that
+  period of time instead of using setTimeout().  This method will ensure that
   items that expire during the same script execution cycle all execute
   together, which is often more efficient than using a real setTimeout.
 
+      Ember.run.later(myContext, function(){
+        // code here will execute within a RunLoop in about 500ms with this == myContext
+      }, 500);
+
   @param {Object} target
     (optional) target of method to invoke
 
@@ -5736,6 +5840,13 @@ function invokeOnceTimer(guid, onceTimers) {
   considered when looking for duplicates.  New arguments will replace previous
   calls.
 
+      Ember.run(function(){
+        var doFoo = function() { foo(); }
+        Ember.run.once(myContext, doFoo);
+        Ember.run.once(myContext, doFoo);
+        // doFoo will only be executed once at the end of the RunLoop
+      });
+
   @param {Object} target
     (optional) target of method to invoke
 
@@ -5795,6 +5906,10 @@ function invokeNextTimers() {
   Schedules an item to run after control has been returned to the system.
   This is often equivalent to calling setTimeout(function...,1).
 
+      Ember.run.next(myContext, function(){
+        // code to be executed in the next RunLoop, which will be scheduled after the current one
+      });
+
   @param {Object} target
     (optional) target of method to invoke
 
@@ -5828,6 +5943,21 @@ Ember.run.next = function(target, method) {
   Cancels a scheduled item.  Must be a value returned by `Ember.run.later()`,
   `Ember.run.once()`, or `Ember.run.next()`.
 
+      var runNext = Ember.run.next(myContext, function(){
+        // will not be executed
+      });
+      Ember.run.cancel(runNext);
+
+      var runLater = Ember.run.next(myContext, function(){
+        // will not be executed
+      }, 500);
+      Ember.run.cancel(runLater);
+
+      var runOnce = Ember.run.once(myContext, function(){
+        // will not be executed
+      });
+      Ember.run.cancel(runOnce);
+
   @param {Object} timer
     Timer object to cancel
 
@@ -5842,10 +5972,9 @@ Ember.run.cancel = function(timer) {
 //
 
 /**
-  @namespace
+  @namespace Compatibility for Ember.run
   @name Ember.RunLoop
   @deprecated
-  @description Compatibility for Ember.run
 */
 
 /**
@@ -5866,9 +5995,11 @@ Ember.RunLoop.end = ember_deprecateFunc("Use Ember.run.end instead of Ember.RunL
 
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -6097,7 +6228,7 @@ Binding.prototype = /** @scope Ember.Binding.prototype */ {
 
   /**
     This will set the "to" property path to the specified value. It will not
-    attempt to reoslve this property path to an actual object until you
+    attempt to resolve this property path to an actual object until you
     connect the binding.
 
     The binding will search for the property path starting at the root object
@@ -6470,9 +6601,9 @@ mixinProperties(Binding,
   /**
     @see Ember.Binding.prototype.single
   */
-  single: function(from) {
+  single: function(from, placeholder) {
     var C = this, binding = new C(null, from);
-    return binding.single();
+    return binding.single(placeholder);
   },
 
   /**
@@ -6486,8 +6617,12 @@ mixinProperties(Binding,
   /**
     @see Ember.Binding.prototype.transform
   */
-  transform: function(func) {
-    var C = this, binding = new C();
+  transform: function(from, func) {
+    if (!func) {
+      func = from;
+      from = null;
+    }
+    var C = this, binding = new C(null, from);
     return binding.transform(func);
   },
 
@@ -6499,6 +6634,15 @@ mixinProperties(Binding,
     return binding.notEmpty(placeholder);
   },
 
+  /**
+    @see Ember.Binding.prototype.notNull
+  */
+  notNull: function(from, placeholder) {
+    var C = this, binding = new C(null, from);
+    return binding.notNull(placeholder);
+  },
+
+
   /**
     @see Ember.Binding.prototype.bool
   */
@@ -6515,6 +6659,14 @@ mixinProperties(Binding,
     return binding.not();
   },
 
+  /**
+    @see Ember.Binding.prototype.isNull
+  */
+  isNull: function(from) {
+    var C = this, binding = new C(null, from);
+    return binding.isNull();
+  },
+
   /**
     Adds a transform that forwards the logical 'AND' of values at 'pathA' and
     'pathB' whenever either source changes. Note that the transform acts
@@ -6756,18 +6908,20 @@ Ember.oneWay = function(obj, to, from) {
   return new Ember.Binding(to, from).oneWay().connect(obj);
 };
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Metal
 // Copyright: ©2011 Strobe Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();
 
-(function(exports) {
+(function() {
 /**
  * @license
  * ==========================================================================
@@ -6798,9 +6952,11 @@ Ember.oneWay = function(obj, to, from) {
  * ==========================================================================
  */
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -6839,18 +6995,36 @@ var toString = Object.prototype.toString;
   It will return the same result across all browsers and includes a bit
   more detail.  Here is what will be returned:
 
-  | Return Value Constant | Meaning |
-  | 'string' | String primitive |
-  | 'number' | Number primitive |
-  | 'boolean' | Boolean primitive |
-  | 'null' | Null value |
-  | 'undefined' | Undefined value |
-  | 'function' | A function |
-  | 'array' | An instance of Array |
-  | 'class' | A Ember class (created using Ember.Object.extend()) |
-  | 'instance' | A Ember object instance |
-  | 'error' | An instance of the Error object |
-  | 'object' | A JavaScript object not inheriting from Ember.Object |
+      | Return Value  | Meaning                                              |
+      |---------------|------------------------------------------------------|
+      | 'string'      | String primitive                                     |
+      | 'number'      | Number primitive                                     |
+      | 'boolean'     | Boolean primitive                                    |
+      | 'null'        | Null value                                           |
+      | 'undefined'   | Undefined value                                      |
+      | 'function'    | A function                                           |
+      | 'array'       | An instance of Array                                 |
+      | 'class'       | A Ember class (created using Ember.Object.extend())  |
+      | 'instance'    | A Ember object instance                              |
+      | 'error'       | An instance of the Error object                      |
+      | 'object'      | A JavaScript object not inheriting from Ember.Object |
+
+  Examples:
+
+      Ember.typeOf();                      => 'undefined'
+      Ember.typeOf(null);                  => 'null'
+      Ember.typeOf(undefined);             => 'undefined'
+      Ember.typeOf('michael');             => 'string'
+      Ember.typeOf(101);                   => 'number'
+      Ember.typeOf(true);                  => 'boolean'
+      Ember.typeOf(Ember.makeArray);       => 'function'
+      Ember.typeOf([1,2,90]);              => 'array'
+      Ember.typeOf(Ember.Object.extend()); => 'class'
+      Ember.typeOf(Ember.Object.create()); => 'instance'
+      Ember.typeOf(new Error('teamocil')); => 'error'
+
+      // "normal" JavaScript object
+      Ember.typeOf({a: 'b'});              => 'object'
 
   @param item {Object} the item to check
   @returns {String} the type
@@ -6876,6 +7050,13 @@ Ember.typeOf = function(item) {
   from JSLint complaining about use of ==, which can be technically
   confusing.
 
+      Ember.none();             => true
+      Ember.none(null);         => true
+      Ember.none(undefined);    => true
+      Ember.none('');           => false
+      Ember.none([]);           => false
+      Ember.none(function(){}); => false
+
   @param {Object} obj Value to test
   @returns {Boolean}
 */
@@ -6886,6 +7067,17 @@ Ember.none = function(obj) {
 /**
   Verifies that a value is null or an empty string | array | function.
 
+  Constrains the rules on `Ember.none` by returning false for empty
+  string and empty arrays.
+
+      Ember.empty();               => true
+      Ember.empty(null);           => true
+      Ember.empty(undefined);      => true
+      Ember.empty('');             => true
+      Ember.empty([]);             => true
+      Ember.empty('tobias fünke'); => false
+      Ember.empty([0,1,2]);        => false
+
   @param {Object} obj Value to test
   @returns {Boolean}
 */
@@ -6893,10 +7085,6 @@ Ember.empty = function(obj) {
   return obj === null || obj === undefined || (obj.length === 0 && typeof obj !== 'function');
 };
 
-/**
-  Ember.isArray defined in ember-metal/lib/utils
-**/
-
 /**
  This will compare two javascript values of possibly different types.
  It will tell you which one is greater than the other by returning:
@@ -6908,6 +7096,10 @@ Ember.empty = function(obj) {
  The order is calculated based on Ember.ORDER_DEFINITION, if types are different.
  In case they have the same type an appropriate comparison for this type is made.
 
+    Ember.compare('hello', 'hello');  => 0
+    Ember.compare('abc', 'dfg');      => -1
+    Ember.compare(2, 1);              => 1
+
  @param {Object} v First value to compare
  @param {Object} w Second value to compare
  @returns {Number} -1 if v < w, 0 if v = w and 1 if v > w.
@@ -7077,6 +7269,10 @@ Ember.inspect = function(obj) {
   internal objects.  For any other object that implements `isEqual()` it will 
   respect that method.
 
+      Ember.isEqual('hello', 'hello');  => true
+      Ember.isEqual(1, 2);              => false
+      Ember.isEqual([4,2], [4,2]);      => false
+
   @param {Object} a first object to compare
   @param {Object} b second object to compare
   @returns {Boolean}
@@ -7144,9 +7340,11 @@ Ember.Error = function() {
 
 Ember.Error.prototype = Ember.create(Error.prototype);
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc.
@@ -7339,9 +7537,11 @@ Ember.String = {
       replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
   }
 };
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -7410,9 +7610,11 @@ if (Ember.EXTEND_PROTOTYPES) {
 }
 
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -7520,9 +7722,11 @@ if (Ember.EXTEND_PROTOTYPES) {
 }
 
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -7556,18 +7760,22 @@ Ember._mixinBindings = function(obj, key, value, m) {
   return value;
 };
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -7679,7 +7887,7 @@ Ember.Enumerable = Ember.Mixin.create( /** @lends Ember.Enumerable */ {
     reaches the your current length-1.  If you run out of data before this
     time for some reason, you should simply return undefined.
 
-    The default impementation of this method simply looks up the index.
+    The default implementation of this method simply looks up the index.
     This works great on any Array-like objects.
 
     @param index {Number} the current index of the iteration
@@ -8304,7 +8512,7 @@ Ember.Enumerable = Ember.Mixin.create( /** @lends Ember.Enumerable */ {
 
     @param {Enumerable} removes
       optional enumerable containing items that were removed from the set.
-      For ordered enumerables, this hsould be an ordered array of items. If
+      For ordered enumerables, this should be an ordered array of items. If
       no items were removed you can pass null.
 
     @returns {Object} receiver
@@ -8336,9 +8544,11 @@ Ember.Enumerable = Ember.Mixin.create( /** @lends Ember.Enumerable */ {
 
 
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -8346,9 +8556,9 @@ Ember.Enumerable = Ember.Mixin.create( /** @lends Ember.Enumerable */ {
 // ==========================================================================
 // ..........................................................
 // HELPERS
-// 
+//
 
-var get = Ember.get, set = Ember.set, meta = Ember.meta;
+var get = Ember.get, set = Ember.set, meta = Ember.meta, map = Ember.ArrayUtils.map;
 
 /** @private */
 function none(obj) { return obj===null || obj===undefined; }
@@ -8360,7 +8570,7 @@ function xform(target, method, params) {
 
 // ..........................................................
 // ARRAY
-// 
+//
 /**
   @namespace
 
@@ -8397,7 +8607,7 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
 
   /** @private - compatibility */
   isSCArray: true,
-  
+
   /**
     @field {Number} length
 
@@ -8421,11 +8631,22 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
     return get(this, idx);
   },
 
+  /**
+    This returns the objects at the specified indexes, using objectAt.
+
+    @param {Array} indexes
+      An array of indexes of items to return.
+   */
+  objectsAt: function(indexes) {
+    var self = this;
+    return map(indexes, function(idx){ return self.objectAt(idx); });
+  },
+
   /** @private (nodoc) - overrides Ember.Enumerable version */
   nextObject: function(idx) {
     return this.objectAt(idx);
   },
-  
+
   /**
     @field []
 
@@ -8474,21 +8695,20 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
   /**
     Returns the index of the given object's first occurrence.
     If no startAt argument is given, the starting location to
-    search is 0. If it's negative, will count backward from 
+    search is 0. If it's negative, will count backward from
     the end of the array. Returns -1 if no match is found.
 
+        var arr = ["a", "b", "c", "d", "a"];
+        arr.indexOf("a");      =>  0
+        arr.indexOf("z");      => -1
+        arr.indexOf("a", 2);   =>  4
+        arr.indexOf("a", -1);  =>  4
+        arr.indexOf("b", 3);   => -1
+        arr.indexOf("a", 100); => -1
+
     @param {Object} object the item to search for
     @param {Number} startAt optional starting location to search, default 0
     @returns {Number} index or -1 if not found
-
-    @example
-    var arr = ["a", "b", "c", "d", "a"];
-    arr.indexOf("a");      =>  0
-    arr.indexOf("z");      => -1
-    arr.indexOf("a", 2);   =>  4
-    arr.indexOf("a", -1);  =>  4
-    arr.indexOf("b", 3);   => -1
-    arr.indexOf("a", 100); => -1
   */
   indexOf: function(object, startAt) {
     var idx, len = get(this, 'length');
@@ -8505,21 +8725,20 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
   /**
     Returns the index of the given object's last occurrence.
     If no startAt argument is given, the search starts from
-    the last position. If it's negative, will count backward 
+    the last position. If it's negative, will count backward
     from the end of the array. Returns -1 if no match is found.
 
+        var arr = ["a", "b", "c", "d", "a"];
+        arr.lastIndexOf("a");      =>  4
+        arr.lastIndexOf("z");      => -1
+        arr.lastIndexOf("a", 2);   =>  0
+        arr.lastIndexOf("a", -1);  =>  4
+        arr.lastIndexOf("b", 3);   =>  1
+        arr.lastIndexOf("a", 100); =>  4
+
     @param {Object} object the item to search for
     @param {Number} startAt optional starting location to search, default 0
     @returns {Number} index or -1 if not found
-
-    @example
-    var arr = ["a", "b", "c", "d", "a"];
-    arr.lastIndexOf("a");      =>  4
-    arr.lastIndexOf("z");      => -1
-    arr.lastIndexOf("a", 2);   =>  0
-    arr.lastIndexOf("a", -1);  =>  4
-    arr.lastIndexOf("b", 3);   =>  1
-    arr.lastIndexOf("a", 100); =>  4
   */
   lastIndexOf: function(object, startAt) {
     var idx, len = get(this, 'length');
@@ -8532,36 +8751,36 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
     }
     return -1;
   },
-  
+
   // ..........................................................
   // ARRAY OBSERVERS
-  // 
-  
+  //
+
   /**
     Adds an array observer to the receiving array.  The array observer object
     normally must implement two methods:
-    
+
     * `arrayWillChange(start, removeCount, addCount)` - This method will be
       called just before the array is modified.
     * `arrayDidChange(start, removeCount, addCount)` - This method will be
       called just after the array is modified.
-      
-    Both callbacks will be passed the starting index of the change as well a 
+
+    Both callbacks will be passed the starting index of the change as well a
     a count of the items to be removed and added.  You can use these callbacks
-    to optionally inspect the array during the change, clear caches, or do 
+    to optionally inspect the array during the change, clear caches, or do
     any other bookkeeping necessary.
-    
-    In addition to passing a target, you can also include an options hash 
+
+    In addition to passing a target, you can also include an options hash
     which you can use to override the method names that will be invoked on the
     target.
-    
+
     @param {Object} target
       The observer object.
-      
+
     @param {Hash} opts
       Optional hash of configuration options including willChange, didChange,
       and a context option.
-      
+
     @returns {Ember.Array} receiver
   */
   addArrayObserver: function(target, opts) {
@@ -8575,15 +8794,15 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
     if (!hasObservers) Ember.propertyDidChange(this, 'hasArrayObservers');
     return this;
   },
-  
+
   /**
-    Removes an array observer from the object if the observer is current 
+    Removes an array observer from the object if the observer is current
     registered.  Calling this method multiple times with the same object will
     have no effect.
-    
+
     @param {Object} target
       The object observing the array.
-    
+
     @returns {Ember.Array} receiver
   */
   removeArrayObserver: function(target, opts) {
@@ -8597,32 +8816,32 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
     if (hasObservers) Ember.propertyDidChange(this, 'hasArrayObservers');
     return this;
   },
-  
+
   /**
     Becomes true whenever the array currently has observers watching changes
     on the array.
-    
+
     @property {Boolean}
   */
   hasArrayObservers: Ember.computed(function() {
     return Ember.hasListeners(this, '@array:change') || Ember.hasListeners(this, '@array:before');
   }).property().cacheable(),
-  
+
   /**
-    If you are implementing an object that supports Ember.Array, call this 
+    If you are implementing an object that supports Ember.Array, call this
     method just before the array content changes to notify any observers and
     invalidate any related properties.  Pass the starting index of the change
     as well as a delta of the amounts to change.
-    
+
     @param {Number} startIdx
       The starting index in the array that will change.
-      
+
     @param {Number} removeAmt
       The number of items that will be removed.  If you pass null assumes 0
-    
+
     @param {Number} addAmt
       The number of items that will be added.  If you pass null assumes 0.
-      
+
     @returns {Ember.Array} receiver
   */
   arrayContentWillChange: function(startIdx, removeAmt, addAmt) {
@@ -8646,14 +8865,14 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
     } else {
       removing = removeAmt;
     }
-    
+
     this.enumerableContentWillChange(removing, addAmt);
 
     // Make sure the @each proxy is set up if anyone is observing @each
     if (Ember.isWatching(this, '@each')) { get(this, '@each'); }
     return this;
   },
-  
+
   arrayContentDidChange: function(startIdx, removeAmt, addAmt) {
 
     // if no args are passed assume everything changes
@@ -8664,7 +8883,7 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
       if (!removeAmt) removeAmt=0;
       if (!addAmt) addAmt=0;
     }
-    
+
     var adding, lim;
     if (startIdx>=0 && addAmt>=0 && get(this, 'hasEnumerableObservers')) {
       adding = [];
@@ -8678,15 +8897,15 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
     Ember.sendEvent(this, '@array:change', startIdx, removeAmt, addAmt);
     return this;
   },
-  
+
   // ..........................................................
   // ENUMERATED PROPERTIES
-  // 
-  
+  //
+
   /**
     Returns a special object that can be used to observe individual properties
     on the array.  Just get an equivalent property on this object and it will
-    return an enumerable that maps automatically to the named key on the 
+    return an enumerable that maps automatically to the named key on the
     member objects.
   */
   '@each': Ember.computed(function() {
@@ -8701,9 +8920,11 @@ Ember.Array = Ember.Mixin.create(Ember.Enumerable, /** @scope Ember.Array.protot
 
 
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -8750,9 +8971,11 @@ Ember.Comparable = Ember.Mixin.create( /** @scope Ember.Comparable.prototype */{
 });
 
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -8812,9 +9035,11 @@ Ember.Copyable = Ember.Mixin.create(
 
 
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -8899,7 +9124,7 @@ Ember.Freezable = Ember.Mixin.create(
     Freezes the object.  Once this method has been called the object should
     no longer allow any properties to be edited.
 
-    @returns {Object} reciever
+    @returns {Object} receiver
   */
   freeze: function() {
     if (get(this, 'isFrozen')) return this;
@@ -8914,9 +9139,11 @@ Ember.FROZEN_ERROR = "Frozen object cannot be modified.";
 
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -8941,7 +9168,6 @@ var forEach = Ember.ArrayUtils.forEach;
   method will only add the object to the enumerable if the object is not
   already present and the object if of a type supported by the enumerable.
 
-      javascript:
       set.addObject(contact);
 
   ## Removing Objects
@@ -8950,7 +9176,6 @@ var forEach = Ember.ArrayUtils.forEach;
   will only remove the object if it is already in the enumerable, otherwise
   this method has no effect.
 
-      javascript:
       set.removeObject(contact);
 
   ## Implementing In Your Own Code
@@ -9028,9 +9253,11 @@ Ember.MutableEnumerable = Ember.Mixin.create(Ember.Enumerable,
 
 });
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -9056,8 +9283,8 @@ var get = Ember.get, set = Ember.set, forEach = Ember.ArrayUtils.forEach;
   can be applied only to a collection that keeps its items in an ordered set.
 
   Note that an Array can change even if it does not implement this mixin.
-  For example, a SparyArray may not be directly modified but if its
-  underlying enumerable changes, it will change also.
+  For example, one might implement a SparseArray that cannot be directly
+  modified, but if its underlying enumerable changes, it will change also.
 
   @extends Ember.Mixin
   @extends Ember.Array
@@ -9069,7 +9296,7 @@ Ember.MutableArray = Ember.Mixin.create(Ember.Array, Ember.MutableEnumerable,
   /**
     __Required.__ You must implement this method to apply this mixin.
 
-    This is one of the primitves you must implement to support Ember.Array.  You
+    This is one of the primitives you must implement to support Ember.Array.  You
     should replace amt objects started at idx with the objects in the passed
     array.  You should also call this.enumerableContentDidChange() ;
 
@@ -9087,6 +9314,24 @@ Ember.MutableArray = Ember.Mixin.create(Ember.Array, Ember.MutableEnumerable,
   */
   replace: Ember.required(),
 
+  /**
+    Remove all elements from self. This is useful if you
+    want to reuse an existing array without having to recreate it.
+
+        var colors = ["red", "green", "blue"];
+        color.length();  => 3
+        colors.clear();  => []
+        colors.length(); => 0
+
+    @returns {Ember.Array} An empty Array. 
+  */
+  clear: function () {
+    var len = get(this, 'length');
+    if (len === 0) return this;
+    this.replace(0, len, EMPTY);
+    return this;
+  },
+
   /**
     This will use the primitive replace() method to insert an object at the
     specified index.
@@ -9257,9 +9502,11 @@ Ember.MutableArray = Ember.Mixin.create(Ember.Array, Ember.MutableEnumerable,
 });
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -9371,17 +9618,25 @@ Ember.Observable = Ember.Mixin.create(/** @scope Ember.Observable.prototype */ {
 
   /**
     To get multiple properties at once, call getProperties
-    with a list of strings:
+    with a list of strings or an array:
 
           record.getProperties('firstName', 'lastName', 'zipCode'); // => { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
 
-    @param {String...} list of keys to get
-    @returns {Hash}
+   is equivalent to:
+
+          record.getProperties(['firstName', 'lastName', 'zipCode']); // => { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+
+    @param {String...|Array} list of keys to get
+    @returns {Hash}
   */
   getProperties: function() {
     var ret = {};
-    for(var i = 0; i < arguments.length; i++) {
-      ret[arguments[i]] = get(this, arguments[i]);
+    var propertyNames = arguments;
+    if (arguments.length === 1 && Ember.typeOf(arguments[0]) === 'array') {
+      propertyNames = arguments[0];
+    }
+    for(var i = 0; i < propertyNames.length; i++) {
+      ret[propertyNames[i]] = get(this, propertyNames[i]);
     }
     return ret;
   },
@@ -9407,7 +9662,7 @@ Ember.Observable = Ember.Mixin.create(/** @scope Ember.Observable.prototype */ {
     If you try to set a value on a key that is undefined in the target
     object, then the unknownProperty() handler will be called instead. This
     gives you an opportunity to implement complex "virtual" properties that
-    are not predefined on the obejct. If unknownProperty() returns
+    are not predefined on the object. If unknownProperty() returns
     undefined, then set() will simply set the value on the object.
 
     ### Property Observers
@@ -9418,7 +9673,7 @@ Ember.Observable = Ember.Mixin.create(/** @scope Ember.Observable.prototype */ {
     observers (i.e. observer methods declared on the same object), will be
     called immediately. Any "remote" observers (i.e. observer methods
     declared on another object) will be placed in a queue and called at a
-    later time in a coelesced manner.
+    later time in a coalesced manner.
 
     ### Chaining
 
@@ -9593,7 +9848,7 @@ Ember.Observable = Ember.Mixin.create(/** @scope Ember.Observable.prototype */ {
     @param {String} key The key to observer
     @param {Object} target The target object to invoke
     @param {String|Function} method The method to invoke.
-    @returns {Ember.Observable} reciever
+    @returns {Ember.Observable} receiver
   */
   removeObserver: function(key, target, method) {
     Ember.removeObserver(this, key, target, method);
@@ -9730,19 +9985,33 @@ Ember.Observable = Ember.Mixin.create(/** @scope Ember.Observable.prototype */ {
     return get(this, keyName);
   },
 
+  /**
+    Returns the cached value of a computed property, if it exists.
+    This allows you to inspect the value of a computed property
+    without accidentally invoking it if it is intended to be
+    generated lazily.
+
+    @param {String} keyName
+    @returns {Object} The cached value of the computed property, if any
+  */
+  cacheFor: function(keyName) {
+    return Ember.cacheFor(this, keyName);
+  },
+
   /** @private - intended for debugging purposes */
   observersForKey: function(keyName) {
     return Ember.observersFor(this, keyName);
   }
-
 });
 
 
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 var get = Ember.get, set = Ember.set, getPath = Ember.getPath;
 
 Ember.TargetActionSupport = Ember.Mixin.create({
@@ -9786,9 +10055,11 @@ Ember.TargetActionSupport = Ember.Mixin.create({
   }
 });
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 var get = Ember.get, set = Ember.set, a_slice = Array.prototype.slice;
 
 /** @private */
@@ -9816,18 +10087,22 @@ Ember.Evented = Ember.Mixin.create({
   }
 });
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -9856,18 +10131,9 @@ function makeCtor() {
   // method a lot faster.  This is glue code so we want it to be as fast as
   // possible.
 
-  var wasApplied = false, initMixins, defaults, init = false, hasChains = false;
+  var wasApplied = false, initMixins, init = false, hasChains = false;
 
   var Class = function() {
-    if (defaults) {
-      for (var prop in defaults) {
-        if (!defaults.hasOwnProperty(prop)) { continue; }
-        Ember.defineProperty(this, prop, undefined, defaults[prop]);
-      }
-
-      defaults = null;
-    }
-
     if (!wasApplied) { Class.proto(); } // prepare prototype...
     if (initMixins) {
       this.reopen.apply(this, initMixins);
@@ -9897,7 +10163,6 @@ function makeCtor() {
     wasApplied = false;
   };
   Class._initMixins = function(args) { initMixins = args; };
-  Class._setDefaults = function(arg) { defaults = arg; };
 
   Class.proto = function() {
     var superclass = Class.superclass;
@@ -9929,9 +10194,13 @@ CoreObject.PrototypeMixin = Ember.Mixin.create(
 
   isInstance: true,
 
+  /** @private */
   init: function() {},
 
+  /** @field */
   isDestroyed: false,
+
+  /** @field */
   isDestroying: false,
 
   /**
@@ -10025,30 +10294,6 @@ var ClassMixin = Ember.Mixin.create({
     return new C();
   },
 
-  /**
-    @private
-
-    Right now, when a key is passed in `create` that is not already
-    present in the superclass, we need to create a mixin object and
-    apply the mixin to the object we're creating. This is
-    unnecessarily expensive. Because Ember views are created a lot,
-    this is a temporary convenience that will allow us to create
-    a new object and set properties before `init` time.
-
-    The correct solution is for the default init code to detect
-    properties that do not need special handling and call
-    `setProperties` on them when `create` occurs. This will
-    massively speed up `create` calls that do not need any special
-    Ember features (like bindings, observers or computed properties)
-    and are not overriding a computed property with a regular value.
-  */
-  createWith: function(defaults) {
-    var C = this;
-    if (arguments.length>0) { this._initMixins(a_slice.call(arguments, 1)); }
-    if (defaults) { this._setDefaults(defaults); }
-    return new C();
-  },
-
   reopen: function() {
     this.willReopen();
     var PrototypeMixin = this.PrototypeMixin;
@@ -10135,9 +10380,11 @@ Ember.CoreObject = CoreObject;
 
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -10274,7 +10521,13 @@ Ember.Set = Ember.CoreObject.extend(Ember.MutableEnumerable, Ember.Copyable, Emb
   clear: function() {
     if (this.isFrozen) { throw new Error(Ember.FROZEN_ERROR); }
     var len = get(this, 'length');
+    var guid;
     this.enumerableContentWillChange(len, 0);
+    for (var i=0; i < len; i++){
+      guid = guidFor(this[i]);
+      delete this[guid];
+      delete this[i];
+    }
     set(this, 'length', 0);
     this.enumerableContentDidChange(len, 0);
     return this;
@@ -10574,9 +10827,11 @@ Ember.Set.create = function(items) {
   }
 };
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -10594,9 +10849,11 @@ Ember.Object = Ember.CoreObject.extend(Ember.Observable);
 
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -10641,9 +10898,11 @@ Ember.Namespace = Ember.Object.extend({
 Ember.Namespace.NAMESPACES = [Ember];
 Ember.Namespace.PROCESSED = false;
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -10675,9 +10934,11 @@ Ember.Namespace.PROCESSED = false;
 Ember.Application = Ember.Namespace.extend();
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -10738,7 +10999,7 @@ Ember.ArrayProxy = Ember.Object.extend(Ember.MutableArray,
     This method will only be called if content is non-null.
 
     @param {Number} idx
-      The index to retreive.
+      The index to retrieve.
 
     @returns {Object} the value or undefined if none found
   */
@@ -10828,9 +11089,11 @@ Ember.ArrayProxy = Ember.Object.extend(Ember.MutableArray,
 
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -11031,9 +11294,11 @@ Ember.EachProxy = Ember.Object.extend({
 
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -11177,9 +11442,11 @@ if (Ember.EXTEND_PROTOTYPES) Ember.NativeArray.activate();
 
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 /**
   JavaScript (before ES6) does not have a Map implementation. Objects,
   which are often used as dictionaries, may only have Strings as keys.
@@ -11378,20 +11645,24 @@ Map.prototype = {
   }
 };
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
-// Project:  Ember Metal
+// Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
@@ -11436,22 +11707,26 @@ Map.prototype = {
 
 Ember.ArrayController = Ember.ArrayProxy.extend();
 
-})({});
+})();
+
+
+
+(function() {
+
+})();
 
-(function(exports) {
 
-})({});
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:  Ember Runtime
 // Copyright: ©2011 Strobe Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -11459,12 +11734,14 @@ Ember.ArrayController = Ember.ArrayProxy.extend();
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-ember_assert("Ember requires jQuery 1.6 or 1.7", window.jQuery && window.jQuery().jquery.match(/^1\.[67](.\d+)?$/));
+ember_assert("Ember requires jQuery 1.6 or 1.7", window.jQuery && window.jQuery().jquery.match(/^1\.[67](\.\d+)?(pre|rc\d?)?/));
 Ember.$ = window.jQuery;
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -11476,6 +11753,7 @@ var get = Ember.get, set = Ember.set;
 var forEach = Ember.ArrayUtils.forEach;
 var indexOf = Ember.ArrayUtils.indexOf;
 
+/** @private */
 var ClassSet = function() {
   this.seen = {};
   this.list = [];
@@ -11813,13 +12091,13 @@ Ember._RenderBuffer.prototype =
 
       openTag = ["<" + tag];
 
-      if (id) { openTag.push('id="' + id + '"'); }
-      if (classes) { openTag.push('class="' + classes.toDOM() + '"'); }
+      if (id) { openTag.push('id="' + this._escapeAttribute(id) + '"'); }
+      if (classes) { openTag.push('class="' + this._escapeAttribute(classes.toDOM()) + '"'); }
 
       if (style) {
         for (prop in style) {
           if (style.hasOwnProperty(prop)) {
-            styleBuffer += (prop + ':' + style[prop] + ';');
+            styleBuffer += (prop + ':' + this._escapeAttribute(style[prop]) + ';');
           }
         }
 
@@ -11829,7 +12107,7 @@ Ember._RenderBuffer.prototype =
       if (attrs) {
         for (prop in attrs) {
           if (attrs.hasOwnProperty(prop)) {
-            openTag.push(prop + '="' + attrs[prop] + '"');
+            openTag.push(prop + '="' + this._escapeAttribute(attrs[prop]) + '"');
           }
         }
       }
@@ -11849,13 +12127,24 @@ Ember._RenderBuffer.prototype =
     } else {
       return content;
     }
+  },
+
+  _escapeAttribute: function(string) {
+    // Escaping only double quotes is probably sufficient, but it can't hurt to do a few more
+    return string.replace(/&/g, '&amp;')
+                 .replace(/</g, '&lt;')
+                 .replace(/>/g, '&gt;')
+                 .replace(/'/g, '&#x27;')
+                 .replace(/"/g, '&quot;');
   }
 
 };
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -12046,9 +12335,11 @@ Ember.EventDispatcher = Ember.Object.extend(
   }
 });
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -12081,7 +12372,6 @@ var get = Ember.get, set = Ember.set;
   You only need to specify the root if your page contains multiple instances
   of Ember.Application.
 
-  @since Ember 2.0
   @extends Ember.Object
 */
 Ember.Application = Ember.Namespace.extend(
@@ -12157,9 +12447,11 @@ Ember.Application = Ember.Namespace.extend(
 
 
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -12172,9 +12464,11 @@ Ember.Application = Ember.Namespace.extend(
 var queues = Ember.run.queues;
 queues.splice(Ember.$.inArray('actions', queues)+1, 0, 'render');
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -12182,9 +12476,11 @@ queues.splice(Ember.$.inArray('actions', queues)+1, 0, 'render');
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -12306,9 +12602,17 @@ Ember.View = Ember.Object.extend(Ember.Evented,
     return template || get(this, 'defaultTemplate');
   }).property('templateName').cacheable(),
 
+  /**
+    The controller managing this view. If this property is set, it will be made
+    made available for use by the template.
+
+    @type Object
+  */
+  controller: null,
+
   /**
     A view may contain a layout. A layout is a regular template but
-    supercedes the `template` property during rendering. It is the
+    supersedes the `template` property during rendering. It is the
     responsibility of the layout template to retrieve the `template`
     property from the view and render it in the correct location.
 
@@ -12353,9 +12657,39 @@ Ember.View = Ember.Object.extend(Ember.Evented,
     @type Object
   */
   templateContext: Ember.computed(function(key, value) {
-    return value !== undefined ? value : this;
+    if (arguments.length === 2) {
+      set(this, '_templateContext', value);
+      return value;
+    } else {
+      return get(this, '_templateContext');
+    }
   }).cacheable(),
 
+  /**
+    @private
+
+    Private copy of the view's template context. This can be set directly
+    by Handlebars without triggering the observer that causes the view
+    to be re-rendered.
+  */
+  _templateContext: Ember.computed(function(key, value) {
+    if (arguments.length === 2) {
+      return value;
+    } else {
+      return this;
+    }
+  }).cacheable(),
+
+  /**
+    If a value that affects template rendering changes, the view should be
+    re-rendered to reflect the new value.
+
+    @private
+  */
+  _displayPropertyDidChange: Ember.observer(function() {
+    this.rerender();
+  }, 'templateContext', 'controller'),
+
   /**
     If the view is currently inserted into the DOM of a parent view, this
     property will point to the parent of the view.
@@ -12511,8 +12845,23 @@ Ember.View = Ember.Object.extend(Ember.Evented,
     var template = get(this, 'layout') || get(this, 'template');
 
     if (template) {
-      var context = get(this, 'templateContext'),
-          data = { view: this, buffer: buffer, isRenderData: true };
+      var context = get(this, '_templateContext'),
+          templateData = this.get('templateData'),
+          controller = this.get('controller');
+
+      var data = {
+        view: this,
+        buffer: buffer,
+        isRenderData: true,
+        keywords: {
+          view: get(this, 'concreteView')
+        }
+      };
+
+      // If the view has a controller specified, make it available to the
+      // template. If not, pass along the parent template's controller,
+      // if it exists.
+      data.keywords.controller = controller || (templateData && templateData.keywords.controller);
 
       // Invoke the template with the provided template context, which
       // is the view by default. A hash of data is also passed that provides
@@ -13479,11 +13828,14 @@ Ember.View = Ember.Object.extend(Ember.Evented,
     @test in createChildViews
   */
   createChildView: function(view, attrs) {
+    var coreAttrs;
+
     if (Ember.View.detect(view)) {
+      coreAttrs = { _parentView: this };
       if (attrs) {
-        view = view.createWith({ _parentView: this }, attrs);
+        view = view.create(coreAttrs, attrs);
       } else {
-        view = view.createWith({ _parentView: this });
+        view = view.create(coreAttrs);
       }
 
       var viewName = view.viewName;
@@ -13495,6 +13847,7 @@ Ember.View = Ember.Object.extend(Ember.Evented,
       ember_assert('must pass instance of View', view instanceof Ember.View);
       set(view, '_parentView', this);
     }
+
     return view;
   },
 
@@ -13579,7 +13932,9 @@ Ember.View = Ember.Object.extend(Ember.Evented,
     also call methods with the given name.
   */
   fire: function(name) {
-    this[name].apply(this, [].slice.call(arguments, 1));
+    if (this[name]) {
+      this[name].apply(this, [].slice.call(arguments, 1));
+    }
     this._super.apply(this, arguments);
   },
 
@@ -13691,9 +14046,11 @@ Ember.View.applyAttributeBindings = function(elem, name, value) {
   }
 };
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -13728,9 +14085,11 @@ Ember.View.reopen({
   states: Ember.View.states
 });
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -13783,9 +14142,11 @@ Ember.View.states.preRender = {
   }
 };
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -13869,9 +14230,11 @@ Ember.View.states.inBuffer = {
 };
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -13928,6 +14291,13 @@ Ember.View.states.hasElement = {
   },
 
   empty: function(view) {
+    var _childViews = get(view, '_childViews'), len, idx;
+    if (_childViews) {
+      len = get(_childViews, 'length');
+      for (idx = 0; idx < len; idx++) {
+        _childViews[idx]._notifyWillDestroyElement();
+      }
+    }
     view.domManager.empty(view);
   },
 
@@ -13950,9 +14320,11 @@ Ember.View.states.inDOM = {
   }
 };
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -13987,9 +14359,11 @@ Ember.View.states.destroyed = {
 };
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -13997,9 +14371,11 @@ Ember.View.states.destroyed = {
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -14013,6 +14389,177 @@ var childViewsProperty = Ember.computed(function() {
   return get(this, '_childViews');
 }).property('_childViews').cacheable();
 
+/**
+  @class
+  @extends Ember.View
+  
+  A `ContainerView` is an `Ember.View` subclass that allows for manual or programatic
+  management of a view's `childViews` array that will correctly update the `ContainerView`
+  instance's rendered DOM representation.
+
+  ## Setting Initial Child Views
+  The initial array of child views can be set in one of two ways. You can provide
+  a `childViews` property at creation time that contains instance of `Ember.View`:
+
+
+        aContainer = Ember.ContainerView.create({
+          childViews: [Ember.View.create(), Ember.View.create()]
+        })
+
+  You can also provide a list of property names whose values are instances of `Ember.View`:
+
+        aContainer = Ember.ContainerView.create({
+          childViews: ['aView', 'bView', 'cView'],
+          aView: Ember.View.create(),
+          bView: Ember.View.create()
+          cView: Ember.View.create()
+        })
+
+  The two strategies can be combined:
+
+        aContainer = Ember.ContainerView.create({
+          childViews: ['aView', Ember.View.create()],
+          aView: Ember.View.create()
+        })
+
+  Each child view's rendering will be inserted into the container's rendered HTML in the same
+  order as its position in the `childViews` property.
+
+  ## Adding and Removing Child Views
+  The views in a container's `childViews` array should be added and removed by manipulating
+  the `childViews` property directly.
+
+  To remove a view pass that view into a `removeObject` call on the container's `childViews` property. 
+
+  Given an empty `<body>` the following code
+
+        aContainer = Ember.ContainerView.create({
+          classNames: ['the-container'],
+          childViews: ['aView', 'bView'],
+          aView: Ember.View.create({
+            template: Ember.Handlebars.compile("A")
+          }),
+          bView: Ember.View.create({
+            template: Ember.Handlebars.compile("B")
+          })
+        })
+
+        aContainer.appendTo('body')
+
+  Results in the HTML
+
+        <div class="ember-view the-container">
+          <div class="ember-view">A</div>
+          <div class="ember-view">B</div>
+        </div>
+
+  Removing a view
+
+        aContainer.get('childViews') // [aContainer.aView, aContainer.bView]
+        aContainer.get('childViews').removeObject(aContainer.get('bView'))
+        aContainer.get('childViews') // [aContainer.aView]
+
+  Will result in the following HTML
+
+        <div class="ember-view the-container">
+          <div class="ember-view">A</div>
+        </div>
+
+
+  Similarly, adding a child view is accomplished by adding `Ember.View` instances to the 
+  container's `childViews` property.
+
+  Given an empty `<body>` the following code
+
+        aContainer = Ember.ContainerView.create({
+          classNames: ['the-container'],
+          childViews: ['aView', 'bView'],
+          aView: Ember.View.create({
+            template: Ember.Handlebars.compile("A")
+          }),
+          bView: Ember.View.create({
+            template: Ember.Handlebars.compile("B")
+          })
+        })
+
+        aContainer.appendTo('body')
+
+  Results in the HTML
+
+        <div class="ember-view the-container">
+          <div class="ember-view">A</div>
+          <div class="ember-view">B</div>
+        </div>
+
+  Adding a view
+
+        AnotherViewClass = Ember.View.extend({
+          template: Ember.Handlebars.compile("Another view")
+        })
+
+        aContainer.get('childViews') // [aContainer.aView, aContainer.bView]
+        aContainer.get('childViews').pushObject(AnotherViewClass.create())
+        aContainer.get('childViews') // [aContainer.aView, <AnotherViewClass instance>]
+
+  Will result in the following HTML
+
+        <div class="ember-view the-container">
+          <div class="ember-view">A</div>
+          <div class="ember-view">Another view</div>
+        </div>
+
+
+  Direct manipulation of childViews presence or absence in the DOM via calls to 
+  `remove` or `removeFromParent` or calls to a container's `removeChild` may not behave
+  correctly.
+
+  Calling `remove()` on a child view will remove the view's HTML, but it will remain as part of its
+  container's `childView`s property.
+
+  Calling `removeChild()` on the container will remove the passed view instance from the container's
+  `childView`s but keep its HTML within the container's rendered view.
+
+  Calling `removeFromParent()` behaves as expected but should be avoided in favor of direct
+  manipulation of a container's `childViews` property.
+
+        aContainer = Ember.ContainerView.create({
+          classNames: ['the-container'],
+          childViews: ['aView', 'bView'],
+          aView: Ember.View.create({
+            template: Ember.Handlebars.compile("A")
+          }),
+          bView: Ember.View.create({
+            template: Ember.Handlebars.compile("B")
+          })
+        })
+
+        aContainer.appendTo('body')
+
+  Results in the HTML
+
+        <div class="ember-view the-container">
+          <div class="ember-view">A</div>
+          <div class="ember-view">B</div>
+        </div>
+
+  Calling `aContainer.get('aView').removeFromParent()` will result in the following HTML
+
+        <div class="ember-view the-container">
+          <div class="ember-view">A</div>
+          <div class="ember-view">B</div>
+        </div>
+
+  And the `Ember.View` instance stored in `aContainer.aView` will be removed from `aContainer`'s
+  `childViews` array.
+
+
+  ## Templates and Layout
+  A `template`, `templateName`, `defaultTempalte`, `layout`, `layoutName` or `defaultLayout`
+  property on a container view will not result in the template or layout being rendered. 
+  The HTML contents of a `Ember.ContainerView`'s DOM representation will only be the rendered HTML
+  of its child views.
+*/
+
 Ember.ContainerView = Ember.View.extend({
 
   init: function() {
@@ -14092,7 +14639,7 @@ Ember.ContainerView = Ember.View.extend({
     if (removed === 0) { return; }
 
     var changedViews = views.slice(start, start+removed);
-    this.setParentView(changedViews, null);
+    this.initializeViews(changedViews, null, null);
 
     this.invokeForState('childViewsWillChange', views, start, removed);
   },
@@ -14119,15 +14666,16 @@ Ember.ContainerView = Ember.View.extend({
     if (added === 0) return;
 
     var changedViews = views.slice(start, start+added);
-    this.setParentView(changedViews, this);
+    this.initializeViews(changedViews, this, get(this, 'templateData'));
 
     // Let the current state handle the changes
     this.invokeForState('childViewsDidChange', views, start, added);
   },
 
-  setParentView: function(views, parentView) {
+  initializeViews: function(views, parentView, templateData) {
     forEach(views, function(view) {
       set(view, '_parentView', parentView);
+      set(view, 'templateData', templateData);
     });
   },
 
@@ -14214,9 +14762,11 @@ Ember.ContainerView.reopen({
   states: Ember.ContainerView.states
 });
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -14228,24 +14778,132 @@ var get = Ember.get, set = Ember.set, fmt = Ember.String.fmt;
 /**
   @class
   @since Ember 0.9
-  @extends Ember.View
-*/
-Ember.CollectionView = Ember.ContainerView.extend(
-/** @scope Ember.CollectionView.prototype */ {
+  @extends Ember.ContainerView
+  
+  `Ember.CollectionView` is an `Ember.View` descendent responsible for managing a
+  collection (an array or array-like object) by maintaing a child view object and 
+  associated DOM representation for each item in the array and ensuring that child
+  views and their associated rendered HTML are updated when items in the array
+  are added, removed, or replaced.
 
-  /**
-    A list of items to be displayed by the Ember.CollectionView.
+  ## Setting content
+  The managed collection of objects is referenced as the `Ember.CollectionView` instance's
+  `content` property.
 
-    @type Ember.Array
-    @default null
-  */
-  content: null,
+      someItemsView = Ember.CollectionView.create({
+        content: ['A', 'B','C']
+      })
 
-  /**
-    An optional view to display if content is set to an empty array.
+  The view for each item in the collection will have its `content` property set
+  to the item.
 
-    @type Ember.View
-    @default null
+  ## Specifying itemViewClass
+  By default the view class for each item in the managed collection will be an instance
+  of `Ember.View`. You can supply a different class by setting the `CollectionView`'s
+  `itemViewClass` property.
+
+  Given an empty `<body>` and the following code:
+
+
+        someItemsView = Ember.CollectionView.create({
+          classNames: ['a-collection'],
+          content: ['A','B','C'],
+          itemViewClass: Ember.View.extend({
+            template: Ember.Handlebars.compile("the letter: {{content}}")
+          })
+        })
+
+        someItemsView.appendTo('body')
+
+  Will result in the following HTML structure
+
+        <div class="ember-view a-collection">
+          <div class="ember-view">the letter: A</div>
+          <div class="ember-view">the letter: B</div>
+          <div class="ember-view">the letter: C</div>
+        </div>
+
+
+  ## Automatic matching of parent/child tagNames
+  Setting the `tagName` property of a `CollectionView` to any of 
+  "ul", "ol", "table", "thead", "tbody", "tfoot", "tr", or "select" will result
+  in the item views receiving an appropriately matched `tagName` property.
+
+
+  Given an empty `<body>` and the following code:
+
+        anUndorderedListView = Ember.CollectionView.create({
+          tagName: 'ul',
+          content: ['A','B','C'],
+          itemViewClass: Ember.View.extend({
+            template: Ember.Handlebars.compile("the letter: {{content}}")
+          })
+        })
+
+        anUndorderedListView.appendTo('body')
+
+  Will result in the following HTML structure
+
+        <ul class="ember-view a-collection">
+          <li class="ember-view">the letter: A</li>
+          <li class="ember-view">the letter: B</li>
+          <li class="ember-view">the letter: C</li>
+        </ul>
+
+  Additional tagName pairs can be provided by adding to `Ember.CollectionView.CONTAINER_MAP `
+
+        Ember.CollectionView.CONTAINER_MAP['article'] = 'section'
+
+
+  ## Empty View
+  You can provide an `Ember.View` subclass to the `Ember.CollectionView` instance as its
+  `emptyView` property. If the `content` property of a `CollectionView` is set to `null`
+  or an empty array, an instance of this view will be the `CollectionView`s only child.
+
+        aListWithNothing = Ember.CollectionView.create({
+          classNames: ['nothing']
+          content: null,
+          emptyView: Ember.View.extend({
+            template: Ember.Handlebars.compile("The collection is empty")
+          })
+        })
+
+        aListWithNothing.appendTo('body')
+
+  Will result in the following HTML structure
+
+        <div class="ember-view nothing">
+          <div class="ember-view">
+            The collection is empty
+          </div>
+        </div>
+
+  ## Adding and Removing items
+  The `childViews` property of a `CollectionView` should not be directly manipulated. Instead,
+  add, remove, replace items from its `content` property. This will trigger
+  appropriate changes to its rendered HTML.
+
+  ## Use in templates via the `{{collection}}` Ember.Handlebars helper
+  Ember.Handlebars provides a helper specifically for adding `CollectionView`s to templates.
+  See `Ember.Handlebars.collection` for more details
+  
+*/
+Ember.CollectionView = Ember.ContainerView.extend(
+/** @scope Ember.CollectionView.prototype */ {
+
+  /**
+    A list of items to be displayed by the Ember.CollectionView.
+
+    @type Ember.Array
+    @default null
+  */
+  content: null,
+
+  /**
+    An optional view to display if content is set to an empty array.
+
+    @type Ember.View
+    @default null
   */
   emptyView: null,
 
@@ -14255,6 +14913,7 @@ Ember.CollectionView = Ember.ContainerView.extend(
   */
   itemViewClass: Ember.View,
 
+  /** @private */
   init: function() {
     var ret = this._super();
     this._contentDidChange();
@@ -14409,9 +15068,11 @@ Ember.CollectionView.CONTAINER_MAP = {
   select: 'option'
 };
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -14419,9 +15080,11 @@ Ember.CollectionView.CONTAINER_MAP = {
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
@@ -14431,9 +15094,9 @@ Ember.CollectionView.CONTAINER_MAP = {
 
 /*globals jQuery*/
 
-})({});
+})();
 
-(function(exports) {
+(function() {
 var get = Ember.get, set = Ember.set, getPath = Ember.getPath;
 
 Ember.State = Ember.Object.extend({
@@ -14501,13 +15164,598 @@ Ember.State = Ember.Object.extend({
   exit: Ember.K
 });
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 var get = Ember.get, set = Ember.set, getPath = Ember.getPath, fmt = Ember.String.fmt;
 /**
   @class
-*/
+  
+  StateManager is part of Ember's implementation of a finite state machine. A StateManager
+  instance manages a number of properties that are instances of `Ember.State`,
+  tracks the current active state, and triggers callbacks when states have changed.
+
+  ## Defining States
+
+  The states of StateManager can be declared in one of two ways. First, you can define
+  a `states` property that contains all the states:
+
+      managerA = Ember.StateManager.create({
+        states: {
+          stateOne: Ember.State.create(),
+          stateTwo: Ember.State.create()
+        }
+      })
+
+      managerA.get('states')
+      // {
+      //   stateOne: Ember.State.create(),
+      //   stateTwo: Ember.State.create()
+      // }
+
+  You can also add instances of `Ember.State` (or an `Ember.State` subclass) directly as properties
+  of a StateManager. These states will be collected into the `states` property for you.
+
+      managerA = Ember.StateManager.create({
+        stateOne: Ember.State.create(),
+        stateTwo: Ember.State.create()
+      })
+
+      managerA.get('states')
+      // {
+      //   stateOne: Ember.State.create(),
+      //   stateTwo: Ember.State.create()
+      // }
+
+  ## The Initial State
+  When created a StateManager instance will immediately enter into the state
+  defined as its `start` property or the state referenced by name in its 
+  `initialState` property:
+
+      managerA = Ember.StateManager.create({
+        start: Ember.State.create({})
+      })
+
+      managerA.getPath('currentState.name') // 'start'
+
+      managerB = Ember.StateManager.create({
+        initialState: 'beginHere',
+        beginHere: Ember.State.create({})
+      })
+
+      managerB.getPath('currentState.name') // 'beginHere'
+
+  Because it is a property you may also provided a computed function if you wish to derive
+  an `initialState` programmatically:
+
+      managerC = Ember.StateManager.create({
+        initialState: function(){
+          if (someLogic) {
+            return 'active';
+          } else {
+            return 'passive';
+          }
+        }.property(),
+        active: Ember.State.create({})
+        passive: Ember.State.create({})
+      })
+
+  ## Moving Between States
+  A StateManager can have any number of Ember.State objects as properties
+  and can have a single one of these states as its current state.
+
+  Calling `goToState` transitions between states:
+
+       robotManager = Ember.StateManager.create({
+        initialState: 'poweredDown',
+         poweredDown: Ember.State.create({}),
+         poweredUp: Ember.State.create({})
+       })
+
+       robotManager.getPath('currentState.name') // 'poweredDown'
+       robotManager.goToState('poweredUp')
+       robotManager.getPath('currentState.name') // 'poweredUp'
+
+  Before transitioning into a new state the existing `currentState` will have its
+  `exit` method called with with the StateManager instance as its first argument and 
+  an object representing the the transition as its second argument.
+
+  After transitioning into a new state the new `currentState` will have its
+  `enter` method called with with the StateManager instance as its first argument and 
+  an object representing the the transition as its second argument.
+
+      robotManager = Ember.StateManager.create({
+       initialState: 'poweredDown',
+        poweredDown: Ember.State.create({
+          exit: function(stateManager, transition){
+            console.log("exiting the poweredDown state")
+          }
+        }),
+        poweredUp: Ember.State.create({
+          enter: function(stateManager, transition){
+            console.log("entering the poweredUp state. Destroy all humans.")
+          }
+        })
+      })
+
+      robotManager.getPath('currentState.name') // 'poweredDown'
+      robotManager.goToState('poweredUp')
+      // will log
+      // 'exiting the poweredDown state'
+      // 'entering the poweredUp state. Destroy all humans.'
+
+
+  Once a StateManager is already in a state, subsequent attempts to enter that state will
+  not trigger enter or exit method calls. Attempts to transition into a state that the 
+  manager does not have will result in no changes in the StateManager's current state:
+
+      robotManager = Ember.StateManager.create({
+       initialState: 'poweredDown',
+        poweredDown: Ember.State.create({
+          exit: function(stateManager, transition){
+            console.log("exiting the poweredDown state")
+          }
+        }),
+        poweredUp: Ember.State.create({
+          enter: function(stateManager, transition){
+            console.log("entering the poweredUp state. Destroy all humans.")
+          }
+        })
+      })
+
+      robotManager.getPath('currentState.name') // 'poweredDown'
+      robotManager.goToState('poweredUp')
+      // will log
+      // 'exiting the poweredDown state'
+      // 'entering the poweredUp state. Destroy all humans.'
+      robotManager.goToState('poweredUp') // no logging, no state change
+
+      robotManager.goToState('someUnknownState') // silently fails
+      robotManager.getPath('currentState.name') // 'poweredUp'
+
+
+  Each state property may itself contain properties that are instances of Ember.State. 
+  The StateManager can transition to specific sub-states in a series of goToState method calls or
+  via a single goToState with the full path to the specific state. The StateManager will also 
+  keep track of the full path to its currentState
+
+
+      robotManager = Ember.StateManager.create({
+        initialState: 'poweredDown',
+         poweredDown: Ember.State.create({
+           charging: Ember.State.create(),
+           charged: Ember.State.create()
+         }),
+         poweredUp: Ember.State.create({
+           mobile: Ember.State.create(),
+           stationary: Ember.State.create()
+         })
+       })
+
+       robotManager.getPath('currentState.name') // 'poweredDown'
+
+       robotManager.goToState('poweredUp')
+       robotManager.getPath('currentState.name') // 'poweredUp'
+
+       robotManager.goToState('mobile')
+       robotManager.getPath('currentState.name') // 'mobile'
+
+       // transition via a state path
+       robotManager.goToState('poweredDown.charging')
+       robotManager.getPath('currentState.name') // 'charging'
+
+       robotManager.getPath('currentState.get.path') // 'poweredDown.charging'
+
+    Enter transition methods will be called for each state and nested child state in their 
+    hierarchical order.  Exit methods will be called for each state and its nested states in
+    reverse hierarchical order.
+
+    Exit transitions for a parent state are not called when entering into one of its child states,
+    only when transitioning to a new section of possible states in the hierarchy.
+
+       robotManager = Ember.StateManager.create({
+         initialState: 'poweredDown',
+          poweredDown: Ember.State.create({
+            enter: function(){},
+            exit: function(){
+              console.log("exited poweredDown state")
+            },
+            charging: Ember.State.create({
+              enter: function(){},
+              exit: function(){}
+            }),
+            charged: Ember.State.create({
+              enter: function(){
+                console.log("entered charged state")
+              },
+              exit: function(){
+                console.log("exited charged state")
+              }
+            })
+          }),
+          poweredUp: Ember.State.create({
+            enter: function(){
+              console.log("entered poweredUp state")
+            },
+            exit: function(){},
+            mobile: Ember.State.create({
+              enter: function(){
+                console.log("entered mobile state")
+              },
+              exit: function(){}
+            }),
+            stationary: Ember.State.create({
+              enter: function(){},
+              exit: function(){}
+            })
+          })
+        })
+
+
+        robotManager.get('currentState.get.path') // 'poweredDown'
+        robotManager.goToState('charged')
+        // logs 'entered charged state'
+        // but does *not* log  'exited poweredDown state'
+        robotManager.getPath('currentState.name') // 'charged
+
+        robotManager.goToState('poweredUp.mobile')
+        // logs
+        // 'exited charged state'
+        // 'exited poweredDown state'
+        // 'entered poweredUp state'
+        // 'entered mobile state'
+
+  During development you can set a StateManager's `enableLogging` property to `true` to
+  receive console messages of state transitions.
+
+        robotManager = Ember.StateManager.create({
+          enableLogging: true
+        })
+
+  ## Managing currentState with Actions
+  To control which transitions between states are possible for a given state, StateManager
+  can receive and route action messages to its states via the `send` method.  Calling to `send` with
+  an action name will begin searching for a method with the same name starting at the current state
+  and moving up through the parent states in a state hierarchy until an appropriate method is found
+  or the StateManager instance itself is reached. 
+
+  If an appropriately named method is found it will be called with the state manager as the first
+  argument and an optional `context` object as the second argument.
+
+      managerA = Ember.StateManager.create({
+        initialState: 'stateOne.substateOne.subsubstateOne',
+        stateOne: Ember.State.create({
+          substateOne: Ember.State.create({
+            anAction: function(manager, context){
+              console.log("an action was called")
+            },
+            subsubstateOne: Ember.State.create({})
+          })
+        })
+      })
+
+      managerA.getPath('currentState.name') // 'subsubstateOne'
+      managerA.send('anAction')
+      // 'stateOne.substateOne.subsubstateOne' has no anAction method
+      // so the 'anAction' method of 'stateOne.substateOne' is called
+      // and logs "an action was called"
+      // with managerA as the first argument
+      // and no second argument
+
+       someObject = {}
+       managerA.send('anAction', someObject)
+       // the 'anAction' method of 'stateOne.substateOne' is called again
+       // with managerA as the first argument and
+       // someObject as the second argument.
+
+
+  If the StateManager attempts to send an action but does not find an appropriately named
+  method in the current state or while moving upwards through the state hierarchy
+  it will throw a new Ember.Error. Action detection only moves upwards through the state hierarchy
+  from the current state. It does not search in other portions of the hierarchy.
+
+        managerB = Ember.StateManager.create({
+          initialState: 'stateOne.substateOne.subsubstateOne',
+          stateOne: Ember.State.create({
+            substateOne: Ember.State.create({
+              subsubstateOne: Ember.State.create({})
+            })
+          }),
+          stateTwo: Ember.State.create({
+           anAction: function(manager, context){
+             // will not be called below because it is
+             // not a parent of the current state
+           }
+          })
+        })
+
+        managerB.getPath('currentState.name') // 'subsubstateOne'
+        managerB.send('anAction')
+        // Error: <Ember.StateManager:ember132> could not
+        // respond to event anAction in state stateOne.substateOne.subsubstateOne.
+
+  Inside of an action method the given state should delegate `goToState` calls on its
+  StateManager.
+
+        robotManager = Ember.StateManager.create({
+          initialState: 'poweredDown.charging',
+           poweredDown: Ember.State.create({
+             charging: Ember.State.create({
+                chargeComplete: function(manager, context){
+                  manager.goToState('charged')
+                }
+             }),
+             charged: Ember.State.create({
+               boot: function(manager, context){
+                  manager.goToState('poweredUp')
+               }
+             })
+           }),
+           poweredUp: Ember.State.create({
+             beginExtermination: function(manager, context){
+                manager.goToState('rampaging')
+             },
+             rampaging: Ember.State.create()
+           })
+         })
+
+         robotManager.getPath('currentState.name') // 'charging'
+         robotManager.send('boot') // throws error, no boot action  
+                                   // in current hierarchy
+         robotManager.getPath('currentState.name') // remains 'charging'
+
+         robotManager.send('beginExtermination') // throws error, no beginExtermination
+                                                 // action in current hierarchy
+         robotManager.getPath('currentState.name') // remains 'charging'
+
+         robotManager.send('chargeComplete')
+         robotManager.getPath('currentState.name') // 'charged'
+
+         robotManager.send('boot')
+         robotManager.getPath('currentState.name') // 'poweredUp'
+
+         robotManager.send('beginExtermination', allHumans)
+         robotManager.getPath('currentState.name') // 'rampaging'
+
+
+  ## Interactions with Ember's View System.
+  When combined with instances of `Ember.ViewState`, StateManager is designed to 
+  interact with Ember's view system to control which views are added to 
+  and removed from the DOM based on the manager's current state.
+
+  By default, a StateManager will manage views inside the 'body' element. This can be
+  customized by setting the `rootElement` property to a CSS selector of an existing 
+  HTML element you would prefer to receive view rendering.
+
+
+      viewStates = Ember.StateManager.create({
+        rootElement: '#some-other-element'
+      })
+
+  You can also specify a particular instance of `Ember.ContainerView` you would like to receive
+  view rendering by setting the `rootView` property. You will be responsible for placing
+  this element into the DOM yourself.
+
+      aLayoutView = Ember.ContainerView.create()
+
+      // make sure this view instance is added to the browser
+      aLayoutView.appendTo('body') 
+
+      App.viewStates = Ember.StateManager.create({
+        rootView: aLayoutView
+      })
+
+
+  Once you have an instance of StateManager controlling a view, you can provide states
+  that are instances of `Ember.ViewState`.  When the StateManager enters a state
+  that is an instance of `Ember.ViewState` that `ViewState`'s `view` property will be
+  instantiated and inserted into the StateManager's `rootView` or `rootElement`.
+  When a state is exited, the `ViewState`'s view will be removed from the StateManager's
+  view.
+
+      ContactListView = Ember.View.extend({
+        classNames: ['my-contacts-css-class'],
+        defaultTemplate: Ember.Handlebars.compile('<h2>People</h2>')
+      })
+
+      PhotoListView = Ember.View.extend({
+        classNames: ['my-photos-css-class'],
+        defaultTemplate: Ember.Handlebars.compile('<h2>Photos</h2>')
+      })
+
+      viewStates = Ember.StateManager.create({
+        showingPeople: Ember.ViewState.create({
+          view: ContactListView
+        }),
+        showingPhotos: Ember.ViewState.create({
+          view: PhotoListView
+        })
+      })
+
+      viewStates.goToState('showingPeople')
+
+  The above code will change the rendered HTML from
+
+      <body></body>
+
+  to
+
+      <body>
+        <div id="ember1" class="ember-view my-contacts-css-class">
+          <h2>People</h2>
+        </div>
+      </body>
+
+  Changing the current state via `goToState` from `showingPeople` to
+  `showingPhotos` will remove the `showingPeople` view and add the `showingPhotos` view:
+
+      viewStates.goToState('showingPhotos')
+
+  will change the rendered HTML to
+
+      <body>
+        <div id="ember2" class="ember-view my-photos-css-class">
+          <h2>Photos</h2>
+        </div>
+      </body>
+
+
+  When entering nested `ViewState`s, each state's view will be draw into the the StateManager's
+  `rootView` or `rootElement` as siblings.
+
+
+      ContactListView = Ember.View.extend({
+        classNames: ['my-contacts-css-class'],
+        defaultTemplate: Ember.Handlebars.compile('<h2>People</h2>')
+      })
+
+      EditAContactView = Ember.View.extend({
+        classNames: ['editing-a-contact-css-class'],
+        defaultTemplate: Ember.Handlebars.compile('Editing...')
+      })
+
+      viewStates = Ember.StateManager.create({
+        showingPeople: Ember.ViewState.create({
+          view: ContactListView,
+
+          withEditingPanel: Ember.ViewState.create({
+            view: EditAContactView
+          })
+        })
+      })
+
+
+      viewStates.goToState('showingPeople.withEditingPanel')
+
+
+  Will result in the following rendered HTML:
+
+      <body>
+        <div id="ember2" class="ember-view my-contacts-css-class">
+          <h2>People</h2>
+        </div>
+
+        <div id="ember2" class="ember-view editing-a-contact-css-class">
+          Editing...
+        </div>
+      </body>
+
+
+  ViewState views are added and removed from their StateManager's view via their
+  `enter` and `exit` methods. If you need to override these methods, be sure to call
+  `_super` to maintain the adding and removing behavior:
+
+      viewStates = Ember.StateManager.create({
+        aState: Ember.ViewState.create({
+          view: Ember.View.extend({}),
+          enter: function(manager, transition){
+            // calling _super ensures this view will be
+            // properly inserted
+            this._super();
+
+            // now you can do other things
+          }
+        })
+      })
+
+  ## Managing Multiple Sections of A Page With States
+  Multiple StateManagers can be combined to control multiple areas of an application's rendered views.
+  Given the following HTML body:
+
+      <body>
+        <div id='sidebar-nav'>
+        </div>
+        <div id='content-area'>
+        </div>
+      </body>
+
+  You could separately manage view state for each section with two StateManagers
+
+      navigationStates = Ember.StateManager.create({
+        rootElement: '#sidebar-nav',
+        userAuthenticated: Em.ViewState.create({
+          view: Ember.View.extend({})
+        }),
+        userNotAuthenticated: Em.ViewState.create({
+          view: Ember.View.extend({})
+        })
+      })
+
+      contentStates = Ember.StateManager.create({
+        rootElement: '#content-area',
+        books: Em.ViewState.create({
+          view: Ember.View.extend({})
+        }),
+        music: Em.ViewState.create({
+          view: Ember.View.extend({})
+        })
+      })
+
+
+  If you prefer to start with an empty body and manage state programmatically you
+  can also take advantage of StateManager's `rootView` property and the ability of 
+  `Ember.ContainerView`s to manually manage their child views. 
+
+
+      dashboard = Ember.ContainerView.create({
+        childViews: ['navigationAreaView', 'contentAreaView'],
+        navigationAreaView: Ember.ContainerView.create({}),
+        contentAreaView: Ember.ContainerView.create({})
+      })
+
+      navigationStates = Ember.StateManager.create({
+        rootView: dashboard.get('navigationAreaView'),
+        userAuthenticated: Em.ViewState.create({
+          view: Ember.View.extend({})
+        }),
+        userNotAuthenticated: Em.ViewState.create({
+          view: Ember.View.extend({})
+        })
+      })
+
+      contentStates = Ember.StateManager.create({
+        rootView: dashboard.get('contentAreaView'),
+        books: Em.ViewState.create({
+          view: Ember.View.extend({})
+        }),
+        music: Em.ViewState.create({
+          view: Ember.View.extend({})
+        })
+      })
+
+      dashboard.appendTo('body')
+
+  ## User Manipulation of State via `{{action}}` Helpers
+  The Handlebars `{{action}}` helper is StateManager-aware and will use StateManager action sending 
+  to connect user interaction to action-based state transitions.
+
+  Given the following body and handlebars template
+
+      <body>
+        <script type='text/x-handlebars'>
+          <a href="#" {{action "anAction" target="App.appStates"}}> Go </a>
+        </script>
+      </body>
+
+  And application code
+
+      App = Ember.Application.create()
+      App.appStates = Ember.StateManager.create({
+        initialState: 'aState',
+        aState: Ember.State.create({
+          anAction: function(manager, context){}
+        }),
+        bState: Ember.State.create({})
+      })
+
+  A user initiated click or touch event on "Go" will trigger the 'anAction' method of
+  `App.appStates.aState` with `App.appStates` as the first argument and a
+  `jQuery.Event` object as the second object. The `jQuery.Event` will include a property
+  `view` that references the `Ember.View` object that was interacted with.
+  
+**/
 Ember.StateManager = Ember.State.extend(
 /** @scope Ember.State.prototype */ {
 
@@ -14730,9 +15978,11 @@ Ember.StateManager = Ember.State.extend(
   }
 });
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 var get = Ember.get, set = Ember.set;
 
 Ember.ViewState = Ember.State.extend({
@@ -14780,18 +16030,20 @@ Ember.ViewState = Ember.State.extend({
   }
 });
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:  Ember Statecharts
 // Copyright: ©2011 Living Social Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   metamorph
 // Copyright: ©2011 My Company Inc. All rights reserved.
@@ -15192,9 +16444,9 @@ Ember.ViewState = Ember.State.extend({
 })(this);
 
 
-})({});
+})();
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -15323,14 +16575,64 @@ Ember.Handlebars.compile = function(string) {
 };
 
 /**
-  Lookup both on root and on window
+  If a path starts with a reserved keyword, returns the root
+  that should be used.
+
+  @private
+*/
+var normalizePath = Ember.Handlebars.normalizePath = function(root, path, data) {
+  var keywords = (data && data.keywords) || {},
+      keyword, isKeyword;
+
+  // Get the first segment of the path. For example, if the
+  // path is "foo.bar.baz", returns "foo".
+  keyword = path.split('.', 1)[0];
+
+  // Test to see if the first path is a keyword that has been
+  // passed along in the view's data hash. If so, we will treat
+  // that object as the new root.
+  if (keywords.hasOwnProperty(keyword)) {
+    // Look up the value in the template's data hash.
+    root = keywords[keyword];
+    isKeyword = true;
+
+    // Handle cases where the entire path is the reserved
+    // word. In that case, return the object itself.
+    if (path === keyword) {
+      path = '';
+    } else {
+      // Strip the keyword from the path and look up
+      // the remainder from the newly found root.
+      path = path.substr(keyword.length);
+    }
+  }
+
+  return { root: root, path: path, isKeyword: isKeyword };
+};
+/**
+  Lookup both on root and on window. If the path starts with
+  a keyword, the corresponding object will be looked up in the
+  template's data hash and used to resolve the path.
 
   @param {Object} root The object to look up the property on
   @param {String} path The path to be lookedup
+  @param {Object} options The template's option hash
 */
-Ember.Handlebars.getPath = function(root, path) {
+
+Ember.Handlebars.getPath = function(root, path, options) {
+  var data = options.data,
+      normalizedPath = normalizePath(root, path, data),
+      value;
+
+  // In cases where the path begins with a keyword, change the
+  // root to the value represented by that keyword, and ensure
+  // the path is relative to it.
+  root = normalizedPath.root;
+  path = normalizedPath.path;
+
   // TODO: Remove this `false` when the `getPath` globals support is removed
-  var value = Ember.getPath(root, path, false);
+  value = Ember.getPath(root, path, false);
+
   if (value === undefined && root !== window && Ember.isGlobalPath(path)) {
     value = Ember.getPath(window, path);
   }
@@ -15360,9 +16662,11 @@ Ember.Handlebars.registerHelper('helperMissing', function(path, options) {
 });
 
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 /*jshint newcap:false*/
 var set = Ember.set, get = Ember.get, getPath = Ember.getPath;
 
@@ -15441,9 +16745,11 @@ Ember.Metamorph = Ember.Mixin.create({
 });
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -15526,14 +16832,15 @@ Ember._BindableSpanView = Ember.View.extend(Ember.Metamorph,
     var property = get(this, 'property'),
         context  = get(this, 'previousContext'),
         valueNormalizer = get(this, 'valueNormalizerFunc'),
-        result;
+        result, templateData;
 
     // Use the current context as the result if no
     // property is provided.
     if (property === '') {
       result = context;
     } else {
-      result = getPath(context, property);
+      templateData = get(this, 'templateData');
+      result = getPath(context, property, { data: templateData });
     }
 
     return valueNormalizer ? valueNormalizer(result) : result;
@@ -15584,12 +16891,12 @@ Ember._BindableSpanView = Ember.View.extend(Ember.Metamorph,
       // If we are preserving the context (for example, if this
       // is an #if block, call the template with the same object.
       if (preserveContext) {
-        set(this, 'templateContext', context);
+        set(this, '_templateContext', context);
       } else {
       // Otherwise, determine if this is a block bind or not.
       // If so, pass the specified object to the template
         if (displayTemplate) {
-          set(this, 'templateContext', result);
+          set(this, '_templateContext', result);
         } else {
         // This is not a bind block, just push the result of the
         // expression to the render context and return.
@@ -15608,9 +16915,9 @@ Ember._BindableSpanView = Ember.View.extend(Ember.Metamorph,
       set(this, 'template', inverseTemplate);
 
       if (preserveContext) {
-        set(this, 'templateContext', context);
+        set(this, '_templateContext', context);
       } else {
-        set(this, 'templateContext', result);
+        set(this, '_templateContext', result);
       }
     } else {
       set(this, 'template', function() { return ''; });
@@ -15620,9 +16927,11 @@ Ember._BindableSpanView = Ember.View.extend(Ember.Metamorph,
   }
 });
 
-})({});
+})();
 
-(function(exports) {
+
+
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -15641,7 +16950,13 @@ var EmberHandlebars = Ember.Handlebars, helpers = EmberHandlebars.helpers;
         fn = options.fn,
         inverse = options.inverse,
         view = data.view,
-        ctx  = this;
+        ctx  = this,
+        normalized;
+
+    normalized = Ember.Handlebars.normalizePath(ctx, property, data);
+
+    ctx = normalized.root;
+    property = normalized.path;
 
     // Set up observers for observable objects
     if ('object' === typeof this) {
@@ -15656,7 +16971,8 @@ var EmberHandlebars = Ember.Handlebars, helpers = EmberHandlebars.helpers;
         inverseTemplate: inverse,
         property: property,
         previousContext: ctx,
-        isEscaped: options.hash.escaped
+        isEscaped: options.hash.escaped,
+        templateData: options.data
       });
 
       view.appendChild(bindView);
@@ -15676,7 +16992,7 @@ var EmberHandlebars = Ember.Handlebars, helpers = EmberHandlebars.helpers;
     } else {
       // The object is not observable, so just render it out and
       // be done with it.
-      data.buffer.push(getPath(this, property));
+      data.buffer.push(getPath(this, property, options));
     }
   };
 
@@ -15835,7 +17151,7 @@ EmberHandlebars.registerHelper('bindAttr', function(options) {
   // Handle classes differently, as we can bind multiple classes
   var classBindings = attrs['class'];
   if (classBindings !== null && classBindings !== undefined) {
-    var classResults = EmberHandlebars.bindClasses(this, classBindings, view, dataId);
+    var classResults = EmberHandlebars.bindClasses(this, classBindings, view, dataId, options);
     ret.push('class="' + classResults.join(' ') + '"');
     delete attrs['class'];
   }
@@ -15849,7 +17165,7 @@ EmberHandlebars.registerHelper('bindAttr', function(options) {
 
     ember_assert(fmt("You must provide a String for a bound attribute, not %@", [property]), typeof property === 'string');
 
-    var value = (property === 'this') ? ctx : getPath(ctx, property),
+    var value = (property === 'this') ? ctx : getPath(ctx, property, options),
         type = Ember.typeOf(value);
 
     ember_assert(fmt("Attributes must be numbers, strings or booleans, not %@", [value]), value === null || value === undefined || type === 'number' || type === 'string' || type === 'boolean');
@@ -15858,7 +17174,7 @@ EmberHandlebars.registerHelper('bindAttr', function(options) {
 
     /** @private */
     observer = function observer() {
-      var result = getPath(ctx, property);
+      var result = getPath(ctx, property, options);
 
       ember_assert(fmt("Attributes must be numbers, strings or booleans, not %@", [result]), result === null || result === undefined || typeof result === 'number' || typeof result === 'string' || typeof result === 'boolean');
 
@@ -15928,7 +17244,7 @@ EmberHandlebars.registerHelper('bindAttr', function(options) {
 
   @returns {Array} An array of class names to add
 */
-EmberHandlebars.bindClasses = function(context, classBindings, view, bindAttrId) {
+EmberHandlebars.bindClasses = function(context, classBindings, view, bindAttrId, options) {
   var ret = [], newClass, value, elem;
 
   // Helper method to retrieve the property from the context and
@@ -15940,7 +17256,7 @@ EmberHandlebars.bindClasses = function(context, classBindings, view, bindAttrId)
 
     property = split[0];
 
-    var val = property !== '' ? getPath(context, property) : true;
+    var val = property !== '' ? getPath(context, property, options) : true;
 
     // If value is a Boolean and true, return the dasherized property
     // name.
@@ -16032,9 +17348,11 @@ EmberHandlebars.bindClasses = function(context, classBindings, view, bindAttrId)
 };
 
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -16046,17 +17364,19 @@ EmberHandlebars.bindClasses = function(context, classBindings, view, bindAttrId)
 var get = Ember.get, set = Ember.set;
 var indexOf = Ember.ArrayUtils.indexOf;
 var PARENT_VIEW_PATH = /^parentView\./;
+var EmberHandlebars = Ember.Handlebars;
 
 /** @private */
-Ember.Handlebars.ViewHelper = Ember.Object.create({
+EmberHandlebars.ViewHelper = Ember.Object.create({
 
   viewClassFromHTMLOptions: function(viewClass, options, thisContext) {
+    var hash = options.hash, data = options.data;
     var extensions = {},
-        classes = options['class'],
+        classes = hash['class'],
         dup = false;
 
-    if (options.id) {
-      extensions.elementId = options.id;
+    if (hash.id) {
+      extensions.elementId = hash.id;
       dup = true;
     }
 
@@ -16066,45 +17386,49 @@ Ember.Handlebars.ViewHelper = Ember.Object.create({
       dup = true;
     }
 
-    if (options.classBinding) {
-      extensions.classNameBindings = options.classBinding.split(' ');
+    if (hash.classBinding) {
+      extensions.classNameBindings = hash.classBinding.split(' ');
       dup = true;
     }
 
-    if (options.classNameBindings) {
-      extensions.classNameBindings = options.classNameBindings.split(' ');
+    if (hash.classNameBindings) {
+      extensions.classNameBindings = hash.classNameBindings.split(' ');
       dup = true;
     }
 
-    if (options.attributeBindings) {
+    if (hash.attributeBindings) {
       ember_assert("Setting 'attributeBindings' via Handlebars is not allowed. Please subclass Ember.View and set it there instead.");
       extensions.attributeBindings = null;
       dup = true;
     }
 
     if (dup) {
-      options = Ember.$.extend({}, options);
-      delete options.id;
-      delete options['class'];
-      delete options.classBinding;
+      hash = Ember.$.extend({}, hash);
+      delete hash.id;
+      delete hash['class'];
+      delete hash.classBinding;
     }
 
     // Look for bindings passed to the helper and, if they are
     // local, make them relative to the current context instead of the
     // view.
-    var path;
+    var path, normalized;
 
-    for (var prop in options) {
-      if (!options.hasOwnProperty(prop)) { continue; }
+    for (var prop in hash) {
+      if (!hash.hasOwnProperty(prop)) { continue; }
 
       // Test if the property ends in "Binding"
       if (Ember.IS_BINDING.test(prop)) {
-        path = options[prop];
-        if (!Ember.isGlobalPath(path)) {
+        path = hash[prop];
+
+        normalized = Ember.Handlebars.normalizePath(null, path, data);
+        if (normalized.isKeyword) {
+          hash[prop] = 'templateData.keywords.'+path;
+        } else if (!Ember.isGlobalPath(path)) {
           if (path === 'this') {
-            options[prop] = 'bindingContext';
+            hash[prop] = 'bindingContext';
           } else {
-            options[prop] = 'bindingContext.'+path;
+            hash[prop] = 'bindingContext.'+path;
           }
         }
       }
@@ -16114,7 +17438,7 @@ Ember.Handlebars.ViewHelper = Ember.Object.create({
     // for the bindings set up above.
     extensions.bindingContext = thisContext;
 
-    return viewClass.extend(options, extensions);
+    return viewClass.extend(hash, extensions);
   },
 
   helper: function(thisContext, path, options) {
@@ -16126,7 +17450,7 @@ Ember.Handlebars.ViewHelper = Ember.Object.create({
         newView;
 
     if ('string' === typeof path) {
-      newView = Ember.Handlebars.getPath(thisContext, path);
+      newView = EmberHandlebars.getPath(thisContext, path, options);
       ember_assert("Unable to find view at path '" + path + "'", !!newView);
     } else {
       newView = path;
@@ -16134,12 +17458,14 @@ Ember.Handlebars.ViewHelper = Ember.Object.create({
 
     ember_assert(Ember.String.fmt('You must pass a view class to the #view helper, not %@ (%@)', [path, newView]), Ember.View.detect(newView));
 
-    newView = this.viewClassFromHTMLOptions(newView, hash, thisContext);
+    newView = this.viewClassFromHTMLOptions(newView, options, thisContext);
     var currentView = data.view;
-    var viewOptions = {};
+    var viewOptions = {
+      templateData: options.data
+    };
 
     if (fn) {
-      ember_assert("You cannot provide a template block if you also specified a templateName", !(get(viewOptions, 'templateName')) && (indexOf(newView.PrototypeMixin.keys(), 'templateName') >= 0));
+      ember_assert("You cannot provide a template block if you also specified a templateName", !get(viewOptions, 'templateName') && !get(newView.proto(), 'templateName'));
       viewOptions.template = fn;
     }
 
@@ -16153,7 +17479,7 @@ Ember.Handlebars.ViewHelper = Ember.Object.create({
   @param {Hash} options
   @returns {String} HTML string
 */
-Ember.Handlebars.registerHelper('view', function(path, options) {
+EmberHandlebars.registerHelper('view', function(path, options) {
   ember_assert("The view helper only takes a single argument", arguments.length <= 2);
 
   // If no path is provided, treat path param as options.
@@ -16162,13 +17488,15 @@ Ember.Handlebars.registerHelper('view', function(path, options) {
     path = "Ember.View";
   }
 
-  return Ember.Handlebars.ViewHelper.helper(this, path, options);
+  return EmberHandlebars.ViewHelper.helper(this, path, options);
 });
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -16184,6 +17512,108 @@ var get = Ember.get, getPath = Ember.Handlebars.getPath, fmt = Ember.String.fmt;
   @param {String} path
   @param {Hash} options
   @returns {String} HTML string
+  
+  `{{collection}}` is a `Ember.Handlebars` helper for adding instances of
+  `Ember.CollectionView` to a template.  See `Ember.CollectionView` for additional
+  information on how a `CollectionView` functions.
+
+  `{{collection}}`'s primary use is as a block helper with a `contentBinding` option
+  pointing towards an `Ember.Array`-compatible object.  An `Ember.View` instance will
+  be created for each item in its `content` property. Each view will have its own
+  `content` property set to the appropriate item in the collection.
+
+  The provided block will be applied as the template for each item's view.
+
+  Given an empty `<body>` the following template:
+
+      <script type="text/x-handlebars">
+        {{#collection contentBinding="App.items"}}
+          Hi {{content.name}}
+        {{/collection}}
+      </script>
+
+  And the following application code
+
+      App = Ember.Application.create()
+      App.items = [
+        Ember.Object.create({name: 'Dave'}),
+        Ember.Object.create({name: 'Mary'}),
+        Ember.Object.create({name: 'Sara'})
+      ]
+
+  Will result in the HTML structure below
+
+      <div class="ember-view">
+        <div class="ember-view">Hi Dave</div>
+        <div class="ember-view">Hi Mary</div>
+        <div class="ember-view">Hi Sara</div>
+      </div>
+
+  ### Blockless Use
+  If you provide an `itemViewClass` option that has its own `template` you can omit
+  the block.
+
+  The following template:
+
+      <script type="text/x-handlebars">
+        {{collection contentBinding="App.items" itemViewClass="App.AnItemView"}}
+      </script>
+
+  And application code
+
+      App = Ember.Application.create()
+      App.items = [
+        Ember.Object.create({name: 'Dave'}),
+        Ember.Object.create({name: 'Mary'}),
+        Ember.Object.create({name: 'Sara'})
+      ]
+
+      App.AnItemView = Ember.View.extend({
+        template: Ember.Handlebars.compile("Greetings {{content.name}}")
+      })
+
+  Will result in the HTML structure below
+
+      <div class="ember-view">
+        <div class="ember-view">Greetings Dave</div>
+        <div class="ember-view">Greetings Mary</div>
+        <div class="ember-view">Greetings Sara</div>
+      </div>
+
+  ### Specifying a CollectionView subclass
+  By default the `{{collection}}` helper will create an instance of `Ember.CollectionView`.
+  You can supply a `Ember.CollectionView` subclass to the helper by passing it
+  as the first argument:
+
+      <script type="text/x-handlebars">
+        {{#collection App.MyCustomCollectionClass contentBinding="App.items"}}
+          Hi {{content.name}}
+        {{/collection}}
+      </script>
+
+
+  ### Forwarded `item.*`-named Options
+  As with the `{{view}}`, helper options passed to the `{{collection}}` will be set on
+  the resulting `Ember.CollectionView` as properties. Additionally, options prefixed with
+  `item` will be applied to the views rendered for each item (note the camelcasing):
+
+        <script type="text/x-handlebars">
+          {{#collection contentBinding="App.items"
+                        itemTagName="p"
+                        itemClassNames="greeting"}}
+            Howdy {{content.name}}
+          {{/collection}}
+        </script>
+
+  Will result in the following HTML structure:
+
+      <div class="ember-view">
+        <p class="ember-view greeting">Howdy Dave</p>
+        <p class="ember-view greeting">Howdy Mary</p>
+        <p class="ember-view greeting">Howdy Sara</p>
+      </div>
+  
+  
 */
 Ember.Handlebars.registerHelper('collection', function(path, options) {
   // If no path is provided, treat path param as options.
@@ -16202,7 +17632,7 @@ Ember.Handlebars.registerHelper('collection', function(path, options) {
   // If passed a path string, convert that into an object.
   // Otherwise, just default to the standard class.
   var collectionClass;
-  collectionClass = path ? getPath(this, path) : Ember.CollectionView;
+  collectionClass = path ? getPath(this, path, options) : Ember.CollectionView;
   ember_assert(fmt("%@ #collection: Could not find %@", data.view, path), !!collectionClass);
 
   var hash = options.hash, itemHash = {}, match;
@@ -16211,7 +17641,7 @@ Ember.Handlebars.registerHelper('collection', function(path, options) {
   var itemViewClass, itemViewPath = hash.itemViewClass;
   var collectionPrototype = collectionClass.proto();
   delete hash.itemViewClass;
-  itemViewClass = itemViewPath ? getPath(collectionPrototype, itemViewPath) : collectionPrototype.itemViewClass;
+  itemViewClass = itemViewPath ? getPath(collectionPrototype, itemViewPath, options) : collectionPrototype.itemViewClass;
   ember_assert(fmt("%@ #collection: Could not find %@", data.view, itemViewPath), !!itemViewClass);
 
   // Go through options passed to the {{collection}} helper and extract options
@@ -16242,7 +17672,7 @@ Ember.Handlebars.registerHelper('collection', function(path, options) {
 
     if (hash.emptyViewClass) {
       emptyViewClass = Ember.View.detect(hash.emptyViewClass) ?
-                          hash.emptyViewClass : getPath(this, hash.emptyViewClass);
+                          hash.emptyViewClass : getPath(this, hash.emptyViewClass, options);
     }
 
     hash.emptyView = emptyViewClass.extend({
@@ -16252,13 +17682,13 @@ Ember.Handlebars.registerHelper('collection', function(path, options) {
   }
 
   if (hash.preserveContext) {
-    itemHash.templateContext = Ember.computed(function() {
+    itemHash._templateContext = Ember.computed(function() {
       return get(this, 'content');
     }).property('content');
     delete hash.preserveContext;
   }
 
-  hash.itemViewClass = Ember.Handlebars.ViewHelper.viewClassFromHTMLOptions(itemViewClass, itemHash, this);
+  hash.itemViewClass = Ember.Handlebars.ViewHelper.viewClassFromHTMLOptions(itemViewClass, { data: data, hash: itemHash }, this);
 
   return Ember.Handlebars.helpers.view.call(this, collectionClass, options);
 });
@@ -16266,9 +17696,11 @@ Ember.Handlebars.registerHelper('collection', function(path, options) {
 
 
 
-})({});
+})();
 
-(function(exports) {
+
+
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -16289,12 +17721,14 @@ var getPath = Ember.Handlebars.getPath;
 */
 Ember.Handlebars.registerHelper('unbound', function(property, fn) {
   var context = (fn.contexts && fn.contexts[0]) || this;
-  return getPath(context, property);
+  return getPath(context, property, fn);
 });
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -16331,9 +17765,11 @@ Ember.Handlebars.registerHelper('debugger', function() {
   debugger;
 });
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 Ember.Handlebars.EachView = Ember.CollectionView.extend(Ember.Metamorph, {
   itemViewClass: Ember.View.extend(Ember.Metamorph)
 });
@@ -16349,9 +17785,11 @@ Ember.Handlebars.registerHelper('each', function(path, options) {
   return Ember.Handlebars.helpers.collection.call(this, 'Ember.Handlebars.EachView', options);
 });
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 /**
   `template` allows you to render a template from inside another template.
   This allows you to re-use the same template in multiple places. For example:
@@ -16388,15 +17826,128 @@ Ember.Handlebars.registerHelper('template', function(name, options) {
   Ember.TEMPLATES[name](this, { data: options.data });
 });
 
-})({});
+})();
+
 
-(function(exports) {
-var EmberHandlebars = Ember.Handlebars, getPath = Ember.Handlebars.getPath;
+
+(function() {
+var EmberHandlebars = Ember.Handlebars, getPath = EmberHandlebars.getPath;
 
 var ActionHelper = EmberHandlebars.ActionHelper = {
   registeredActions: {}
 };
+/**
+  @name Handlebars.helpers.action
+  
+  The `{{action}}` helper registers an HTML element within a template for
+  DOM event handling.  User interaction with that element will call the method
+  on the template's associated `Ember.View` instance that has the same name
+  as the first provided argument to `{{action}}`:
+
+  Given the following Handlebars template on the page
+
+        <script type="text/x-handlebars" data-template-name='a-template'>
+            <div {{action "anActionName"}}>
+              click me
+            </div>
+        </script>
+
+  And application code
+
+        AView = Ember.View.extend({
+          templateName; 'a-template',
+          anActionName: function(event){}
+        })
+
+        aView = AView.create()
+        aView.appendTo('body')
+
+  Will results in the following rendered HTML
+
+        <div class="ember-view">
+          <div data-ember-action="1">
+            click me
+          </div>
+        </div>
+
+  Clicking "click me" will trigger the `anActionName` method of the `aView` object with a 
+  `jQuery.Event` object as its argument. The `jQuery.Event` object will be extended to include
+  a `view` property that is set to the original view interacted with (in this case the `aView` object).
+
+
+  ### Specifying an Action Target
+  A `target` option can be provided to change which object will receive the method call. This option must be
+  a string representing a path to an object:
+
+        <script type="text/x-handlebars" data-template-name='a-template'>
+            <div {{action "anActionName" target="MyApplication.someObject"}}>
+              click me
+            </div>
+        </script>
+
+  Clicking "click me" in the rendered HTML of the above template will trigger the 
+  `anActionName` method of the object at `MyApplication.someObject`.  The first argument 
+  to this method will be a `jQuery.Event` extended to include a `view` property that is 
+  set to the original view interacted with.
+
+  A path relative to the template's `Ember.View` instance can also be used as a target:
+
+        <script type="text/x-handlebars" data-template-name='a-template'>
+            <div {{action "anActionName" target="parentView"}}>
+              click me
+            </div>
+        </script>
+
+  Clicking "click me" in the rendered HTML of the above template will trigger the 
+  `anActionName` method of the view's parent view.
+
+  The `{{action}}` helper is `Ember.StateManager` aware. If the target of
+  the action is an `Ember.StateManager` instance `{{action}}` will use the `send`
+  functionality of StateManagers. The documentation for `Ember.StateManager` has additional
+  information about this use.
+
+  If an action's target does not implement a method that matches the supplied action name
+  an error will be thrown.
+
+
+      <script type="text/x-handlebars" data-template-name='a-template'>
+          <div {{action "aMethodNameThatIsMissing"}}>
+            click me
+          </div>
+      </script>
+
+  With the following application code
+
+        AView = Ember.View.extend({
+          templateName; 'a-template',
+          // note: no method 'aMethodNameThatIsMissing'
+          anActionName: function(event){}
+        })
 
+        aView = AView.create()
+        aView.appendTo('body')
+
+  Will throw `Uncaught TypeError: Cannot call method 'call' of undefined` when "click me" is clicked.
+
+
+  ### Specifying DOM event type
+  By default the `{{action}}` helper registers for DOM `click` events. You can supply an
+  `on` option to the helper to specify a different DOM event name:
+
+      <script type="text/x-handlebars" data-template-name='a-template'>
+          <div {{action "aMethodNameThatIsMissing" on="doubleClick"}}>
+            click me
+          </div>
+      </script>
+
+  See `Ember.EventDispatcher` for a list of acceptable DOM event names.
+
+  Because `{{action}}` depends on Ember's event dispatch system it will only function if
+  an `Ember.EventDispatcher` instance is available. An `Ember.EventDispatcher` instance 
+  will be created when a new `Ember.Application` is created. Having an instance of
+  `Ember.Application` will satisfy this requirement.
+  
+*/
 ActionHelper.registerAction = function(actionName, eventName, target, view, context) {
   var actionId = (++Ember.$.uuid).toString();
 
@@ -16406,7 +17957,8 @@ ActionHelper.registerAction = function(actionName, eventName, target, view, cont
       event.view = view;
       event.context = context;
 
-      if ('function' === typeof target.send) {
+      // Check for StateManager (or compatible object)
+      if (target.isState && typeof target.send === 'function') {
         return target.send(actionName, event);
       } else {
         return target[actionName].call(target, event);
@@ -16423,23 +17975,68 @@ ActionHelper.registerAction = function(actionName, eventName, target, view, cont
 
 EmberHandlebars.registerHelper('action', function(actionName, options) {
   var hash = options.hash || {},
-      eventName = options.hash.on || "click",
+      eventName = hash.on || "click",
       view = options.data.view,
       target, context;
 
   if (view.isVirtual) { view = view.get('parentView'); }
-  target = options.hash.target ? getPath(this, options.hash.target) : view;
+  target = hash.target ? getPath(this, hash.target, options) : view;
   context = options.contexts[0];
 
   var actionId = ActionHelper.registerAction(actionName, eventName, target, view, context);
   return new EmberHandlebars.SafeString('data-ember-action="' + actionId + '"');
 });
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 var get = Ember.get, set = Ember.set;
 
+/**
+  @name Handlebars.helpers.yield
+  
+  When used in a Handlebars template that is assigned to an `Ember.View` instance's
+  `layout` property Ember will render the layout template first, inserting the view's
+  own rendered output at the `{{ yield }}` location.
+  
+  An empty `<body>` and the following application code:
+  
+        AView = Ember.View.extend({
+          classNames: ['a-view-with-layout'],
+          layout: Ember.Handlebars.compile('<div class="wrapper">{{ yield }}</div>'),
+          template: Ember.Handlebars.compile('<span>I am wrapped</span>')
+        })
+
+        aView = AView.create()
+        aView.appendTo('body')
+        
+  Will result in the following HTML output:
+  
+        <body>
+          <div class='ember-view a-view-with-layout'>
+            <div class="wrapper">
+              <span>I am wrapped</span>
+            </div>
+          </div>
+        </body>
+  
+  
+  The yield helper cannot be used outside of a template assigned to an `Ember.View`'s `layout` property
+  and will throw an error if attempted.
+  
+      BView = Ember.View.extend({
+        classNames: ['a-view-with-layout'],
+        template: Ember.Handlebars.compile('{{yield}}')
+      })
+
+      bView = BView.create()
+      bView.appendTo('body')
+      
+      // throws
+      // Uncaught Error: assertion failed: You called yield in a template that was not a layout
+*/
 Ember.Handlebars.registerHelper('yield', function(options) {
   var view = options.data.view, template;
 
@@ -16451,31 +18048,36 @@ Ember.Handlebars.registerHelper('yield', function(options) {
 
   template = get(view, 'template');
 
-  ember_assert("You called yield on " + view.toString() + " without supplying a template", !!template);
-  template(this, options);
+  if (template) { template(this, options); }
 });
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -16483,35 +18085,100 @@ Ember.Handlebars.registerHelper('yield', function(options) {
 // ==========================================================================
 var set = Ember.set, get = Ember.get;
 
-// TODO: Be explicit in the class documentation that you
-// *MUST* set the value of a checkbox through Ember.
-// Updating the value of a checkbox directly via jQuery objects
-// will not work.
+/**
+  @class
+  
+  Creates an HTML input view in one of two formats.
+  
+  If a `title` property or binding is provided the input will be wrapped in
+  a `div` and `label` tag. View properties like `classNames` will be applied to
+  the outermost `div`. This behavior is deprecated and will issue a warning in development.
+  
+  
+      {{view Ember.Checkbox classNames="applicaton-specific-checkbox" title="Some title"}}
+      
+      
+      <div id="ember1" class="ember-view ember-checkbox applicaton-specific-checkbox">
+        <label><input type="checkbox" />Some title</label>
+      </div>
+  
+  If `title` isn't provided the view will render as an input element of the 'checkbox' type and HTML
+  related properties will be applied directly to the input.
+  
+      {{view Ember.Checkbox classNames="applicaton-specific-checkbox"}}
+      
+      <input id="ember1" class="ember-view ember-checkbox applicaton-specific-checkbox" type="checkbox">
+  
+  You can add a `label` tag yourself in the template where the Ember.Checkbox is being used.
+  
+      <label>
+        Some Title
+        {{view Ember.Checkbox classNames="applicaton-specific-checkbox"}}
+      </label>
+      
+  
+  The `checked` attribute of an Ember.Checkbox object should always be set
+  through the Ember object or by interacting with its rendered element representation
+  via the mouse, keyboard, or touch.  Updating the value of the checkbox via jQuery will
+  result in the checked value of the object and its element losing synchronization.
 
+*/
 Ember.Checkbox = Ember.View.extend({
-  title: null,
-  value: false,
+  classNames: ['ember-checkbox'],
+
+  tagName: Ember.computed(function(){
+    return get(this, 'title') ? undefined : 'input';
+  }).property(),
+
+  attributeBindings: Ember.computed(function(){
+    return get(this, 'title') ? [] : ['type', 'checked', 'disabled'];
+  }).property(),
+
+  type: "checkbox",
+  checked: false,
   disabled: false,
 
-  classNames: ['ember-checkbox'],
+  title:  Ember.computed(function(propName, value){
+    ember_deprecate("Automatically surrounding Ember.Checkbox inputs with a label by providing a 'title' property is deprecated", value === undefined);
+    return value;
+  }).property().cacheable(),
 
-  defaultTemplate: Ember.Handlebars.compile('<label><input type="checkbox" {{bindAttr checked="value" disabled="disabled"}}>{{title}}</label>'),
+  defaultTemplate: Ember.computed(function(){
+    if (get(this, 'title')) {
+      return Ember.Handlebars.compile('<label><input type="checkbox" {{bindAttr checked="checked" disabled="disabled"}}>{{title}}</label>');
+    } else {
+      return undefined;
+    }
+  }).property().cacheable(),
+
+  value: Ember.computed(function(propName, value){
+    ember_deprecate("Ember.Checkbox's 'value' property has been renamed to 'checked' to match the html element attribute name");
+    if (value !== undefined) {
+      return set(this, 'checked', value);
+    } else {
+      return get(this, 'checked');
+    }
+  }).property('checked'),
 
   change: function() {
     Ember.run.once(this, this._updateElementValue);
     // returning false will cause IE to not change checkbox state
   },
-
+  
+  /**
+    @private
+  */
   _updateElementValue: function() {
-    var input = this.$('input:checkbox');
-    set(this, 'value', input.prop('checked'));
+    var input = get(this, 'title') ? this.$('input:checkbox') : this.$();
+    set(this, 'checked', input.prop('checked'));
   }
 });
 
+})();
+
 
-})({});
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -16567,9 +18234,11 @@ Ember.TextSupport.KEY_EVENTS = {
   27: 'cancel'
 };
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -16592,9 +18261,11 @@ Ember.TextField = Ember.View.extend(Ember.TextSupport,
   size: null
 });
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -16612,6 +18283,20 @@ Ember.Button = Ember.View.extend(Ember.TargetActionSupport, {
 
   attributeBindings: ['type', 'disabled', 'href'],
 
+  /** @private
+    Overrides TargetActionSupport's targetObject computed
+    property to use Handlebars-specific path resolution.
+  */
+  targetObject: Ember.computed(function() {
+    var target = get(this, 'target'),
+        root = get(this, 'templateContext'),
+        data = get(this, 'templateData');
+
+    if (typeof target !== 'string') { return target; }
+
+    return Ember.Handlebars.getPath(root, target, { data: data });
+  }).property('target').cacheable(),
+
   // Defaults to 'button' if tagName is 'input' or 'button'
   type: Ember.computed(function(key, value) {
     var tagName = this.get('tagName');
@@ -16690,9 +18375,11 @@ Ember.Button = Ember.View.extend(Ember.TargetActionSupport, {
   }
 });
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -16727,14 +18414,18 @@ Ember.TextArea = Ember.View.extend(Ember.TextSupport,
 
 });
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 Ember.TabContainerView = Ember.View.extend();
 
-})({});
+})();
 
-(function(exports) {
+
+
+(function() {
 var get = Ember.get, getPath = Ember.getPath;
 
 Ember.TabPaneView = Ember.View.extend({
@@ -16747,9 +18438,11 @@ Ember.TabPaneView = Ember.View.extend({
   }).property('tabsContainer.currentView')
 });
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 var get = Ember.get, setPath = Ember.setPath;
 
 Ember.TabView = Ember.View.extend({
@@ -16762,17 +18455,21 @@ Ember.TabView = Ember.View.extend({
   }
 });
 
-})({});
+})();
+
 
-(function(exports) {
 
-})({});
+(function() {
 
-(function(exports) {
+})();
+
+
+
+(function() {
 /*jshint eqeqeq:false */
 
 var set = Ember.set, get = Ember.get, getPath = Ember.getPath;
-var indexOf = Ember.ArrayUtils.indexOf;
+var indexOf = Ember.ArrayUtils.indexOf, indexesOf = Ember.ArrayUtils.indexesOf;
 
 Ember.Select = Ember.View.extend({
   tagName: 'select',
@@ -16780,7 +18477,9 @@ Ember.Select = Ember.View.extend({
     '{{#if prompt}}<option>{{prompt}}</option>{{/if}}' +
     '{{#each content}}{{view Ember.SelectOption contentBinding="this"}}{{/each}}'
   ),
+  attributeBindings: ['multiple'],
 
+  multiple: false,
   content: null,
   selection: null,
   prompt: null,
@@ -16797,6 +18496,29 @@ Ember.Select = Ember.View.extend({
   },
 
   change: function() {
+    if (get(this, 'multiple')) {
+      this._changeMultiple();
+    } else {
+      this._changeSingle();
+    }
+  },
+
+  selectionDidChange: Ember.observer(function() {
+    var selection = get(this, 'selection'),
+        isArray = Ember.isArray(selection);
+    if (get(this, 'multiple')) {
+      if (!isArray) {
+        set(this, 'selection', Ember.A([selection]));
+        return;
+      }
+      this._selectionDidChangeMultiple();
+    } else {
+      this._selectionDidChangeSingle();
+    }
+  }, 'selection'),
+
+
+  _changeSingle: function() {
     var selectedIndex = this.$()[0].selectedIndex,
         content = get(this, 'content'),
         prompt = get(this, 'prompt');
@@ -16808,7 +18530,22 @@ Ember.Select = Ember.View.extend({
     set(this, 'selection', content.objectAt(selectedIndex));
   },
 
-  selectionDidChange: Ember.observer(function() {
+  _changeMultiple: function() {
+    var options = this.$('option:selected'),
+        prompt = get(this, 'prompt'),
+        offset = prompt ? 1 : 0,
+        content = get(this, 'content');
+
+    if (!content){ return; }
+    if (options) {
+      var selectedIndexes = options.map(function(){
+        return this.index - offset;
+      }).toArray();
+      set(this, 'selection', content.objectsAt(selectedIndexes));
+    }
+  },
+
+  _selectionDidChangeSingle: function() {
     var el = this.$()[0],
         content = get(this, 'content'),
         selection = get(this, 'selection'),
@@ -16817,7 +18554,23 @@ Ember.Select = Ember.View.extend({
 
     if (prompt) { selectionIndex += 1; }
     if (el) { el.selectedIndex = selectionIndex; }
-  }, 'selection')
+  },
+
+  _selectionDidChangeMultiple: function() {
+    var content = get(this, 'content'),
+        selection = get(this, 'selection'),
+        selectedIndexes = indexesOf(content, selection),
+        prompt = get(this, 'prompt'),
+        offset = prompt ? 1 : 0,
+        options = this.$('option');
+
+    if (options) {
+      options.each(function() {
+        this.selected = indexOf(selectedIndexes, this.index + offset) > -1;
+      });
+    }
+  }
+
 });
 
 Ember.SelectOption = Ember.View.extend({
@@ -16833,8 +18586,15 @@ Ember.SelectOption = Ember.View.extend({
   },
 
   selected: Ember.computed(function() {
-    // Primitives get passed through bindings as objects... since `new Number(4) !== 4`, we use `==` below
-    return get(this, 'content') == getPath(this, 'parentView.selection');
+    var content = get(this, 'content'),
+        selection = getPath(this, 'parentView.selection');
+    if (getPath(this, 'parentView.multiple')) {
+      return selection && indexOf(selection, content) > -1;
+    } else {
+      // Primitives get passed through bindings as objects... since
+      // `new Number(4) !== 4`, we use `==` below
+      return content == selection;
+    }
   }).property('content', 'parentView.selection'),
 
   labelPathDidChange: Ember.observer(function() {
@@ -16859,18 +18619,22 @@ Ember.SelectOption = Ember.View.extend({
 });
 
 
-})({});
+})();
+
+
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();
+
 
-(function(exports) {
+
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
@@ -16903,15 +18667,12 @@ Ember.Handlebars.bootstrap = function(ctx) {
     var compile = (script.attr('type') === 'text/x-raw-handlebars') ?
                   Ember.$.proxy(Handlebars.compile, Handlebars) :
                   Ember.$.proxy(Ember.Handlebars.compile, Ember.Handlebars),
-      // Get the id of the script, used by Ember.View's elementId property,
-      // Look for data-element-id attribute.
-      elementId = script.attr('data-element-id'),
       // Get the name of the script, used by Ember.View's templateName property.
       // First look for data-template-name attribute, then fall back to its
       // id if no name is found.
       templateName = script.attr('data-template-name') || script.attr('id'),
       template = compile(script.html()),
-      view, viewPath, tagName;
+      view, viewPath, elementId, tagName, options;
 
     if (templateName) {
       // For templates which have a name, we save them and then remove them from the DOM
@@ -16936,15 +18697,19 @@ Ember.Handlebars.bootstrap = function(ctx) {
       viewPath = script.attr('data-view');
       view = viewPath ? Ember.getPath(viewPath) : Ember.View;
 
+      // Get the id of the script, used by Ember.View's elementId property,
+      // Look for data-element-id attribute.
+      elementId = script.attr('data-element-id');
+
       // Users can optionally specify a custom tag name to use by setting the
       // data-tag-name attribute on the script tag.
       tagName = script.attr('data-tag-name');
 
-      view = view.create({
-        elementId: elementId,
-        template: template,
-        tagName: (tagName) ? tagName : undefined
-      });
+      options = { template: template };
+      if (elementId) { options.elementId = elementId; }
+      if (tagName)   { options.tagName   = tagName; }
+
+      view = view.create(options);
 
       view._insertElementLater(function() {
         script.replaceWith(this.$());
@@ -16962,23 +18727,25 @@ Ember.$(document).ready(
   }
 );
 
-})({});
+})();
 
-(function(exports) {
+
+
+(function() {
 // ==========================================================================
 // Project:   Ember Handlebar Views
 // Copyright: ©2011 Strobe Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();
 
-(function(exports) {
+(function() {
 // ==========================================================================
 // Project:   Ember
 // Copyright: ©2011 Strobe Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-})({});
+})();