1
Merge branch 'master' of https://github.com/342141332/thirty.git

Conflicts:
	projects/checkmate/client/core/flash/src/com/gearbrother/mushroomWar/model/ModelRegister.as
	projects/checkmate/client/core/flash/src/com/gearbrother/mushroomWar/view/layer/scene/battle/BattleItemSceneView.as
	projects/checkmate/client/core/flash/src/com/gearbrother/mushroomWar/view/layer/scene/battle/BattleSceneViewCanvas.as
	projects/checkmate/server/core/java/src/com/gearbrother/mushroomWar/pojo/BattleItem.java
	projects/checkmate/server/core/java/src/com/gearbrother/mushroomWar/pojo/BattleItemBuilding.java
	projects/checkmate/server/core/java/src/com/gearbrother/mushroomWar/pojo/BattleItemSoilder.java
	projects/checkmate/server/core/java/src/com/gearbrother/mushroomWar/pojo/BattleRoom.java
	projects/checkmate/server/core/java/src/com/gearbrother/mushroomWar/pojo/TaskAttack.java
	projects/checkmate/server/core/java/src/com/gearbrother/mushroomWar/pojo/TaskDefense.java
	projects/checkmate/server/core/java/src/com/gearbrother/mushroomWar/pojo/TaskDispatch.java
	projects/checkmate/server/core/java/src/com/gearbrother/mushroomWar/pojo/TaskProduce.java
	projects/checkmate/server/core/java/src/com/gearbrother/mushroomWar/rpc/service/bussiness/BattleService.java