fix jianxiong

fix jianxiong
Merge pull request #1 from omnisreen/master

fix jianxiong
remove NosRende
modify
tuxi...
replace all TriggerSkill::trigger & QUN4+5
delete TriggerSkill::trigger()

delete unrelated skills
delete UI about huashen
贾诩
庞德+张角
mashu-fix
wind package(without buqu/hongyan), not tested
Merge branch 'master' of https://github.com/Fsu0413/QSanguosha-For-Hegemony

Conflicts:
	src/package/nostalgia.cpp
	src/package/nostalgia.h
	src/package/wind.cpp
conflict....
shu generals in firepackage
hasskill && haslordskill
蔡文姬
ask_who修改失败所以相关改动全部reverse了
Merge pull request #1 from Fsu0413/master

合并原作者更新