partial standardization of navigation
Merged conflicts with renaming controller files

Conflicts:
	app/views/layouts/application.html.erb
	db/development
Merge branch 'master' of github.com:coursehub/coursehub