remove beforeUpdate
Merge branch 'origin/develop'

Conflicts:
	grails-app/jobs/DataImportJob.groovy