中立牌
Merge branch 'master' of https://github.com/zfnlj/zgc

Conflicts:
	.gitignore
	Classes/GameLogic/KBattleDeck.cpp
	Resources/armature/anim_elem2.plist
	Resources/armature/anim_elem2.png
	Resources/data/card/Ability.txt
	Resources/data/card/SoldierCard.txt
	tool/ExportTable/CardInfo.xls