Groups refactoring

With start of scheduled events
Merge branch 'scheduled_events_2' into umanni-develop