header changes

need to roll back and rethink css to less conversion
menu changes
Merge branch 'master' of https://github.com/mjhandy/SiteTemplate

Conflicts:
	src/less/deskTopHeader.less
	src/php/header.php