minor changes
Merge branch 'biodiv_usergroups' of git@github.com:strandls/biodiv.git into biodiv_usergroups