Merge origin/master

Conflicts:
	web/index.xhtml
Merge origin/master