编写战斗系统
Merge branch 'master' of https://github.com/miragine/Mir2.git

Conflicts:
	mir2_appserver/src/mir2/core/fight/pool/FighterMessage.java
	mir2_appserver/src/mir2/core/fight/pool/FighterUnit.java
	mir2_appserver/src/mir2/core/fight/pool/PlayerFighterUnit.java
	mir2_appserver/src/mir2/core/fight/pool/SimpleFighting.java