edited admin_login.php changed if statement
Resolve merge conflict

Conflicts:
	toets/admin/admin_login.php