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

Conflicts:
	client/core/flash/com.gearbrother.mushroomWar.client.core.flash/.project
	client/core/flash/com.gearbrother.mushroomWar.client.core.flash/src/com/gearbrother/mushroomWar/view/common/ui/AvatarUiView.as
	client/core/flash/com.gearbrother.mushroomWar.client.core.flash/src/com/gearbrother/mushroomWar/view/layer/scene/battle/BattleItemSceneView.as
	server/core/java/com.gearbrother.mushroomWar.server.core.java/src/com/gearbrother/mushroomWar/pojo/BattleRoom.java
	server/core/java/com.gearbrother.mushroomWar.server.core.java/src/com/gearbrother/mushroomWar/pojo/TaskTroopDispatch.java
	server/core/java/com.gearbrother.mushroomWar.server.core.java/src/com/gearbrother/mushroomWar/pojo/TaskTroopMove.java
	server/core/java/com.gearbrother.mushroomWar.server.core.java/src/com/gearbrother/mushroomWar/rpc/codeGenerater/GenerateRpcClientCode.java
	server/core/java/com.gearbrother.mushroomWar.server.core.java/src/com/gearbrother/mushroomWar/rpc/service/bussiness/BattleService.java