Changes to navigation sidebar
Trying to merge
Merge branch 'master' of https://github.com/crowdpublishtv/teamawesome

Conflicts:
	app/views/layouts/application.html.erb