Attending list working
Attending list working
Merge remote-tracking branch 'origin/master'