add removeEvent button and EditEvent activity
resolve conflict