DB updates based on result settings checkboxes
Merge branch 'master' of https://github.com/lorencs/Ualberta-Assessment-Tool-Prototype

Conflicts:
	languages/lang.en.php
	languages/lang.fr.php
	php/examEditFuncs.php