Header fix
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-war/web/css/main.css.map
	HomeCinema-war/web/scss/main.scss