migrate 2
Merge branch 'biodiv_usergroups' of github.com:strandls/biodiv into
biodiv_usergroups

Conflicts:
	grails-app/domain/species/Metadata.groovy
	grails-app/views/common/observation/_showObservationLocationTemplate.gsp