Merge remote-tracking branch 'origin/master'

Conflicts:
	Web/web/pages/template/menu.xhtml