Clean Up Events Controller
Add Venues to Events
Merge branch 'events' into develop