header
Fixing header

Conflicts:
	htdocs/js/header.js
Merge remote-tracking branch 'origin/master'