Updated Event with new Date and Time code
Merge remote-tracking branch 'origin/event-classes'