Nikesh & Toan | Feature Added: Event can now delete an event
Nikesh & Toan | Feature Added: user can only delete an event if there the owner of the event
fixed conflicts