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

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