Merge origin/develop into develop

Conflicts:
	src/main/webapp/index.xhtml