Added events table view controller for setting event names.
Fixing merge conflicts.