added support for bootstrap3 grid
Merge branch 'with-elearning' of https://github.com/StudentLifeMarketingAndDesign/dean-of-students into with-elearning

Conflicts:
	composer.lock