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

Conflicts:
	projects/mushroomWar/server/core/java/com.gearbrother.mushroomWar.server.java.core/src/com/gearbrother/mushroomWar/pojo/BattleItemBuilding.java