Merge remote-tracking branch 'origin/Benton'

Conflicts:
	login.php