Removed the usage of the event.date field, as it is no longer a part of the data model.
Merge branch 'develop' into issue-44