merge conflict
Merge branch 'master' of github.com:antiqe/RType

Conflicts:
	Client/RoomState.cpp
Merge branch 'master' of github.com:antiqe/RType
Merge branch 'master' of github.com:antiqe/RType