Proper attendee to event list
Merge branch 'master' into production