minor
Merge branch 'biodiv_usergroups' of https://github.com/strandls/biodiv into biodiv_usergroups

Conflicts:
	grails-app/views/species/show.gsp