todo on waitlist eror in conf. room
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ConferenceRoom.java