renamed events.start and events.end to events.start_time and events.end_time because 'end' is a reserved word in SQL
refactored to new event fields
Merge branch 'hotfix/event_times' into develop