document some ember-testing helpers
fix some consistencies mistakes

I don't know if the remainings `control` terms are legits or not, so I didn't touch them. Please let me now if all `control` should be renamed to `component`. cc/ @wycats
Show `beforeModel` and `afterModel` in API Route docs
Merge pull request #2883 from bradfol/route-docs

Show `beforeModel` and `afterModel` in API Route docs
Merge pull request #2879 from sly7-7/patch-1

fix some consistencies mistakes
Update Handlebars version.
Merge pull request #2845 from fivetanley/document-ember-testing

document some ember-testing helpers
Use Ember setter to set Ember.Route controller.
Support grouping option for Ember.Select using optgroup
Merge pull request #2465 from tricknotes/optgroup-for-select

Support grouping option for Ember.Select using optgroup
Switch from unbind to off for router location events
Merge pull request #2885 from gdub22/router-location-unbind

Switch from unbind to off for router location events
small typo in ember evented comments
Merge pull request #2891 from izhan/doc_tweak

small typo in ember evented comments
Calling router.map now appends the routes instead of replacing them

I would have added a test but there did not seem to be any route
generation tests.
Revert "Use Ember setter to set Ember.Route controller."

This is intentionally not-observable

This reverts commit 693119d65bada2fe16bba90c2bafacf9db8e470e.
Added functionality to Router.map to allow it to be called multiple times without the map being overwritten. Allows routes to be added at runtime. One test with multiple cases also added.

Conflicts:

	packages/ember-routing/lib/system/router.js
Merge pull request #2892 from igorT/router_append

Calling router.map now appends the routes instead of replacing them
Update router.js. Fixes #2897.
Merge pull request #2898 from machty/borf-snorlax

Update router.js. Fixes #2897.