Give logo fixed width
Merge branch 'logo_rendering' into issue6_header

Conflicts:
	WebContent/index.css
Make logo disappear at window width <= 1450px
Merge branch 'issue6_header'