Merge remote-tracking branch 'github/master' into etriks

Conflicts:
	grails-app/views/layouts/_commonheader.gsp
Merge remote-tracking branch 'gitlab/etriks-1.2' into research

Conflicts:
	grails-app/views/layouts/_commonheader.gsp