Merge branch 'master' of https://github.com/NonprofitSoftwareSuperGroup/CAS3Files

Conflicts:
	cas3database .sql
	class/loginModule.php
	index.php
	studentConfirmationPage.php