minor
Merge branch 'biodiv_usergroups' of https://github.com/MoAF/bhutanbiodiv into biodiv_usergroups

Conflicts:
	bbp-config.groovy
minor changes