New event grid stuff
Event model changes
Merge remote-tracking branch 'ur-calendar-dev/master'