header, login, cert status, prefs, create acct
Merge remote-tracking branch 'origin/master'

Conflicts:
	public_html/header.php