more division changes
Merge branch 'conform-to-division-project' of https://github.com/StudentLifeMarketingAndDesign/isa into conform-to-division-project

Conflicts:
	composer.lock
	themes/isa/build/build.js
	themes/isa/css/master.css
	themes/isa/css/master.css.map
	themes/isa/images/header-bg-test.jpg
	themes/isa/scss/imports/_theme.scss
	themes/isa/templates/Includes/EventList.ss