Editing and deletion functionality implemented for events
Merge remote-tracking branch 'upstream/master'