refix something
refix something
Merge branch 'master' of https://github.com/tungha/DiamondTest into resultScreen

Conflicts:
	DiamondTest/src/com/cnc/diamond/components/BattleRoom.java
	DiamondTest/src/com/cnc/diamond/components/Game.java
fix some bug
fix some bug
fix some bug