Updating category_group to calendar in views
Fix getting categories to include categories shared through partners
Merge branch 'master' into rename-cat-groups
Cleaning up labels