Minor restructuring of events to disallow event hosts from unattending.
Merge branch 'feature/events2.0' into develop