Merge pull request #35 from capacity4dev/feature/CFD-46-Add_Group_Category_&_Tags_to_the_demo_content_module

Add group category & tags to the demo content module
Merge branch 'develop' into feature/CFD-41-Add_Events_to_the_demo_content_module