Merge origin/origin into origin

Conflicts:
	web/index.xhtml
	web/resources/css/styles.css