Change title labels on location cells
Fix merge conflict on AddNewEventVC