some code changes in permission script
Merge branch 'biodiv_usergroups' of github.com:strandls/biodiv into
biodiv_usergroups

Conflicts:
	grails-app/services/speciespage/UserGroupService.groovy
Merge branch 'biodiv_usergroups' of github.com:strandls/biodiv into biodiv_usergroups