Minor
Merge branch 'biodiv2.0' of https://github.com/strandls/biodiv into biodiv2.0

Conflicts:
	grails-app/views/common/observation/_showMapInputTemplate.gsp