removed edit event
Merge branch 'edit_event_remove' into development