added delete button to Edit Event page
fixed merge conflicts