Started fixing Date objects in Events
Merge branch 'devDan' into dev