Make the modal close on click the cancel button
Merge branch 'master' of https://github.com/tomrcroft/cmpe165

Conflicts:
	resetAction.php
	resetAction2.php