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...
Merge branch 'biodiv_checklist' of https://github.com/strandls/biodiv into biodiv_checklist

Conflicts:
	grails-app/conf/Config.groovy
Added the default from address
COnfig changes to accomodate external configuration
Merge branch 'biodiv_usergroups' of https://github.com/MoAF/bhutanbiodiv into biodiv_usergroups

Conflicts:
	app-conf/apache-virtualhost-conf
External COnfig File
Adding external configuration
Bhutan location, and apache configs changed
Bhutan specific external config file