1. Event remove
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/default/edit.php
1. Event remove fixed
1. Event remove fixed