Command Upgrade
Merge branch 'master' of https://github.com/tungha/DiamondTest into battleEffect

Conflicts:
	DiamondTest/src/com/cnc/diamond/game/Logic.java
Effect Apply 1st
Gonna merge with Coin Golden Chest eater-Without image
Merge branch 'master' of https://github.com/tungha/DiamondTest into battleEffect

Conflicts:
	DiamondTest/src/com/cnc/diamond/game/Logic.java