Fix for javascript being executed four time
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	grails-app/views/activity.gsp
	grails-app/views/entity.gsp