Name Page is finished
Merge branch 'master' of https://github.com/tungha/DiamondTest into battleDemo

Conflicts:
	DiamondTest-android/assets/gfx/buttons.pack
	DiamondTest-android/assets/gfx/buttons.png
	DiamondTest/src/com/cnc/diamond/Diamond.java
	DiamondTest/src/com/cnc/diamond/battle/BattleView.java
	DiamondTest/src/com/cnc/diamond/battle/animations/BaseCharacter.java
	DiamondTest/src/com/cnc/diamond/battle/animations/BattleCharacter.java
	DiamondTest/src/com/cnc/diamond/battle/animations/StateBack.java
	DiamondTest/src/com/cnc/diamond/battle/animations/StateCharge.java
	DiamondTest/src/com/cnc/diamond/components/Game.java
	DiamondTest/src/com/cnc/diamond/game/View.java
	DiamondTest/src/com/cnc/diamond/ui/TextureButton.java
fix bug