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

Conflicts:
	app-conf/apache-virtualhost-conf
Common name language change, image permision, and some minor changes
Merge branch 'biodiv_checklist' into biodiv_usergroups

Conflicts:
	grails-app/views/emailtemplates/addObservation.gsp
minor