delete event done
redid event delete page
Merge remote-tracking branch 'origin/master'