local changes whcih will be overwrirtten
Merge branch 'biodiv_usergroups' of https://github.com/MoAF/bhutanbiodiv into biodiv_usergroups
Merge branch 'biodiv_usergroups' of https://github.com/MoAF/bhutanbiodiv into biodiv_usergroups

Conflicts:
	grails-app/conf/Config.groovy
	grails-app/services/speciespage/TaxonService.groovy
Merge branch 'biodiv_usergroups' of https://github.com/MoAF/bhutanbiodiv into biodiv_usergroups
Merge branch 'biodiv_usergroups' of https://github.com/MoAF/bhutanbiodiv into biodiv_usergroups

Conflicts:
	grails-app/services/speciespage/TaxonService.groovy
Merge branch 'biodiv_usergroups' of https://github.com/MoAF/bhutanbiodiv into biodiv_usergroups
Merge branch 'biodiv_usergroups' of https://github.com/MoAF/bhutanbiodiv into biodiv_usergroups
some local changes
Merge branch 'biodiv_usergroups' of https://github.com/MoAF/bhutanbiodiv into biodiv_usergroups

Conflicts:
	userscripts/loadData.groovy
Merge branch 'biodiv_usergroups' of https://github.com/MoAF/bhutanbiodiv into biodiv_usergroups
Merge branch 'biodiv_usergroups' of https://github.com/MoAF/bhutanbiodiv into biodiv_usergroups
small changes to namesIndexer