add: agenda watchers
add: contacts helper in controllers
Merge branch 'agenda_watchers_test' into contact_helpers
fix: group/ungroup
Merge branch 'agenda_watchers_test'
ops