added events, event_attendees, and more fields to agenda_items
fix merge conflict
fix merge conflict