first commit
Merge branch 'battleDemo' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest/src/com/cnc/diamond/battle/BattleStat.java
	DiamondTest/src/com/cnc/diamond/battle/BattleView.java
	DiamondTest/src/com/cnc/diamond/battle/animations/BattleCharacter.java
	DiamondTest/src/com/cnc/diamond/battle/animations/StateAttack.java
	DiamondTest/src/com/cnc/diamond/battle/animations/StateMove.java
	DiamondTest/src/com/cnc/diamond/components/Game.java