Allow a template explicitly set on a view to be used when rendering a route.
add test for user provided template on a view
Consider `controllerName` in Ember.Route#render()

The previously introduced `controllerName` on a route hasn't been
considered when resolving the controller which shall be used within
`Ember.Route#render()`.
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
update to rsvp-2.0.2; fixes unit tests for RSVP#rethrow in IE 6,7,8
Merge pull request #3240 from twokul/master

update to rsvp-2.0.2; fixes unit tests for RSVP#rethrow in IE 6,7,8
Improve actions hash change deprecation messages to include the object and actionName, to make them easier to track down.
Merge branch 'pr/2983' into stable
Merge branch 'stable'
Fixed incorrect capitalization from 'link-To' -> 'link-to'
Merge pull request #3244 from mattsjohnston/patch-1

Fixed incorrect capitalization from 'link-To' -> 'link-to' in changelog
Warn when the router encounters a url it cannot handle.
Fix #3241.

The issue was solely in the tests: a stray `forEach`.
Merge pull request #3248 from hjdivad/fix-3241

Fix #3241.
Update ember-dev to print published locations.
Merge pull request #3243 from lukemelia/improved-actions-hash-deprecations

Improve actions hash change deprecation messages
Merge branch 'stable'