Bug fix
Merge branch 'master' of https://github.com/strandls/biodiv

Conflicts:
	grails-app/services/speciespage/ObservationService.groovy