Changes to the name and all
Merge branch 'biodiv_usergroups' of https://github.com/strandls/biodiv into biodiv_usergroups

Conflicts:
	app-conf/apache-virtualhost-conf
Merge branch 'biodiv_usergroups' of https://github.com/strandls/biodiv into biodiv_usergroups
email templates in observation ...
Email templates
Merge branch 'biodiv_usergroups' of https://github.com/strandls/biodiv into biodiv_usergroups

Conflicts:
	app-conf/apache-virtualhost-conf
	grails-app/controllers/species/participation/ObservationController.groovy
	grails-app/services/speciespage/ObservationService.groovy
Add addObservation template
Merge branch 'biodiv_usergroups' into biodiv_checklist
Added modified config
Minor removal of arbitrary codes
conflict resolved