Router/layout updates for 0.8.0
Merge branch 'master' of github.com:cmalven/generator-meteor

Conflicts:
	app/templates/client/views/layout/layout.html