temp
Merge branch 'master' of https://github.com/gaodayihao/QSanguosha

Conflicts:
	src/server/room.cpp
temp merge step II
Merge branch 'master' of https://github.com/gaodayihao/QSanguosha