EB
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/views/layouts/main.gsp
	web-app/css/main.css
EB