InnasCommit
Merge branch 'master' into Inna

Conflicts:
	Sopra/WebContent/WEB-INF/templates/header.xhtml