Changed error message when couldn't join room
Show original error message
Merge branch 'master' into gmail

Conflicts:
	src/server_events.h