Add missing un-added files from previous commits
Merge branch 'master' into attendee-array-in-event-request
make tests pass