Refine data model
Refine data model
Merge branch 'develop' of https://github.com/owlab/fresto-events into develop