event_id correction
Merge remote-tracking branch 'origin/templates' into templates
WIP fixing event instance creation; grouping when/where fields in event creator
Merge commit '16d52524c7b72e3d86d082b985390da49c433384' into templates