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
Adding external configuration
minor changes to config
Merge branch 'biodiv_checklist' of https://github.com/strandls/biodiv into biodiv_checklist

Conflicts:
	grails-app/conf/Config.groovy
Keeps the scientific name in proper format
Merge branch 'biodiv_usergroups' of https://github.com/strandls/biodiv into biodiv_checklist

Conflicts:
	app-conf/apache-virtualhost-conf
Changes in email templates
Some stupid thing.....
ettings for log4j stacktrace log
Merge branch 'biodiv_checklist' of https://github.com/strandls/biodiv into biodiv_checklist
Minor changes to email template
Merge pull request #10 from kxt5258/biodiv_checklist

Email notification changes
Minor changes to email template
Bhutan map customization
Minor changes to email templates
Merge pull request #12 from kxt5258/biodiv_checklist

Minor changes to email template
Log4j configuration (different appenders for env.)
Merge branch 'biodiv_checklist' of https://github.com/strandls/biodiv into biodiv_checklist