Merge origin/master

Conflicts:
	web/resources/template/WhiteboardTemplate.xhtml