Merge origin/master

Conflicts:
	web/templates/header.xhtml
Merge origin/master