bug fixes and style changes
Merge branch 'biodiv_usergroups' of github.com:strandls/biodiv into biodiv_usergroups