First commit
jsjdsjsj
Merge remote-tracking branch 'upstream/biodiv_usergroups' into biodiv_usergroups
changed heading for bhutan
bashrc changes
apache conf changes
merged
Conf.groovy -> add external conf file to env.
observation service
Merge remote-tracking branch 'upstream/biodiv_usergroups' into biodiv_usergroups

Conflicts:
	.bashrc
	app-conf/apache-virtualhost-conf
	application.properties
	grails-app/conf/Config.groovy
Small changes in Config.groovy
Small changes...
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