Allow a template explicitly set on a view to be used when rendering a route.
add test for user provided template on a view
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