added Group and Transaction models
Merge branch 'groups'