merge master
Merge remote-tracking branch 'origin/connie1'
adding accept join feature onto the event host