All Effects are done
clean up
Merge branch 'master' of https://github.com/tungha/DiamondTest into battleDemo

Conflicts:
	DiamondTest/src/com/cnc/diamond/Diamond.java
	DiamondTest/src/com/cnc/diamond/battle/BattleView.java
	DiamondTest/src/com/cnc/diamond/battle/Character.java
	DiamondTest/src/com/cnc/diamond/components/Game.java
	DiamondTest/src/com/cnc/diamond/ui/TextureButton.java
merge and clean