Categories implementation
Merge branch 'master' into groups_implementation
finalized groups and categories implementation