Did admin lockout on all pages and rad lockout
Merge branch 'master' of https://github.com/CMPUT391W14TTJ/c391RIS

Conflicts:
	proj/account_settings.php~
	proj/um_familyDoctor.php~
	proj/um_persons.php~
	proj/um_users.php~
	proj/user_management.php~