stuff
Merge branch 'develop' of https://github.com/smacewan101/School-Me into develop

Conflicts:
	apps/content/modules/main/views/map.php
Merge branch 'develop' of https://github.com/smacewan101/School-Me into develop
fixed check box issue