Header update
Merge commit 'afd5b38b0ce4ca85da73ac0dd4bc75dcb62a76dc'

Conflicts:
	Less/war/css/main.css