Add handling joining room
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/to2/dice/server/Server.java