converted to division project
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/dean-of-students

Conflicts:
	themes/dos/images/hero-image.jpg
	themes/dos/templates/Includes/Header.ss
	themes/dos/templates/Layout/HomePage.ss
	themes/dos/templates/Page.ss