Edits to header layout
Merge remote-tracking branch 'origin/Header' into Merge-Test

Conflicts:
	Themes/CP2014/Content/styles.css