Gorups: added groups
Merge branch 'develop' of github.com:fishtree/fishtree_api into develop