Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master
Admin can now edit # of attendees
Merge origin/master