Added edit link and functionality
Added tooltip for edit button in event show page
Fixed conflicts