Merge origin/master

Conflicts:
	web/workaoe.xhtml
Merge origin/master