Steve Sept. 18 - Show page update
Merge branch 'master' of https://github.com/cosborne89/dormchef

Conflicts:
	app/views/shared/_related_content_extended_container.html.erb