a simpler way to create BattleArraySkill and an instance(Niaoxiang)
Merge branch 'master' of github.com:Fsu0413/QSanguosha-For-Hegemony

Conflicts:
	src/server/serverplayer.h
Merge branch 'master' of github.com:Fsu0413/QSanguosha-For-Hegemony