解析战况
Merge remote-tracking branch 'origin/master'

Conflicts:
	game/src/game/battle/auto/BattleSituation.java
	game/src/game/battle/auto/Formation9.java
	game/src/game/battle/auto/ParseBattleSituation.java
	game/test/game/battle/auto/AutoBattleTest.java