Merge branch 'master' into dev-AMEC-1848

Conflicts:
	webapp/src/main/webapp/css/global.css