Merge remote-tracking branch 'origin/master' into gui-restructure

Conflicts:
	src/main/webapp/Config.xhtml
	src/main/webapp/WEB-INF/web.xml
conflict fixed