file cleanup
Merge branch 'master' into group-feature
added manage group tab: add/delete groups
Merge pull request #8 from AdrianTM/group-feature

added manage group tab: add/delete groups