Latest changes to for testing
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-ocelli/grails-app/views/application/index.gsp