.
Merge branch 'dev' of github.com:QSanguosha-Rara/QSanguosha-For-Hegemony into dev

Conflicts:
	lua/ai/standard-qun-ai.lua
..