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

Conflicts:
	src/package/joy.cpp