Logic beta 2
Merge branch 'battleEffect' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest/src/com/cnc/diamond/game/AIInput.java
	DiamondTest/src/com/cnc/diamond/game/GameInput.java
	DiamondTest/src/com/cnc/diamond/game/IInput.java
Add gem statistic to logic
fix combo notify bug
fix refresh money bug
Merge branch 'battleEffect' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest/src/com/cnc/diamond/battle/BattleStat.java
	DiamondTest/src/com/cnc/diamond/battle/Character.java