Allow a template explicitly set on a view to be used when rendering a route.
add test for user provided template on a view
Remove some commented test code.
Rename computed array macros to match #3158
remove deprecated function (prepare 1.0)
Update serialize documentation to reflect improved default behavior
Warn when the router encounters a url it cannot handle.
FIX: A grouped #each with no content would raise errors.
FIX: You can change a grouped #each's content right before destroying it.
Add Ember.PromiseProxyMixin

A low level primitive for using ObjectProxy, ObjectController
and ArrayController's with promises.
Merge branch 'pr/3247' into stable - Resolves #3247
Merge branch 'pr/3247' - Resolves #3247
Merge branch 'pr/3245' - Resolves #3245
Merge branch 'pr/3245' into stable - Resolves #3245
Merge pull request #3084 from stefanpenner/promise_proxy

Add Ember.PromiseProxyMixin
cleanup promise proxy

- utilize RSVP.rethrow + Promise.fail
- update isResolved -> isSettled, to comply with promise/a+ naming conventions
  (cc @domenic)
Merge pull request #3262 from stefanpenner/promise-proxy-cleanup

cleanup promise proxy
Fix bug where link-to wouldn't be active even if resource is active
Merge pull request #3268 from teddyzeenny/link-to-active

Fix bug where link-to wouldn't be active even if resource is active
Update Gemfile.lock for latest ember-dev