edit events
Merge branch 'feature/event_edit_new-42' into staging