Check HTTP USER/PW keys exist in $_SERVER
htaccess/htpasswd auth method added
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/define.php