most of bugs fixed
fixed login highlight problem
Merge remote-tracking branch 'remotes/github/fixHeaderBugs'

Conflicts:
	templates/header.php