Attendee

Merge attendee branch