Added attend/unattend functionality
Changes to event lists
 merge stuff