Merge origin/master

Conflicts:
	src/main/webapp/template.xhtml