Slightly less forceful message for Ember Inspector
remove un-needed double assertion, and improve assertion message
Pull Controller#controllers CP Kick into init.
Add route name in Route#model hook assertion
Merge pull request #3279 from stefanpenner/remove-needs-double-assertion

cleanup needs CP
Merge branch 'commented-tests' of https://github.com/xtian/ember.js into xtian-commented-tests

Conflicts:
	packages/ember/tests/routing/basic_test.js
Merge branch 'xtian-commented-tests'
Merge pull request #3214 from pangratz/remove_doc_for_super_call_in_route

Remove documentation for this._super() within a route's event
Remove reference to deprecated `{{collection}}` helper - Fixes #3014
Simplify the mechanism for warning that ember-states was removed
Sync router.js, closes #3242
fix SimpleHandlebarsView destroy
Merge branch 'route-view-template' of https://github.com/mmpestorich/ember.js into mmpestorich-route-view-template

Conflicts:
	packages/ember-routing/lib/system/route.js
provide hook for persistence libraries to injection custom find
behavior.
Ember.reduceComputed tolerates initially null values.

Fix #3255.
Merge pull request #3282 from stefanpenner/custom_store_hook

provide hook for persistence libraries to injection custom find/create behavior.
fix typo (thanks @trek)
Ember.reduceComputed remove in reverse order.

This makes simple implementations of things like `filter` easier to reason
about.

Fix #3272.
Merge pull request #3284 from hjdivad/array-computed-bug-fixes

Fix a couple of arrayComputed bugs.
length is manually notified of changes and already
stashed in _childViews.length