Clean up
local master mistake
battle damage
1st commit
Merge branch 'BATTLEVIEW' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest-desktop/src/com/cnc/diamond/Main.java
	DiamondTest/src/com/cnc/diamond/game/AIInput.java
Merge branch 'master' of https://github.com/tungha/DiamondTest into NEWUI

Conflicts:
	DiamondTest-html/war/WEB-INF/lib/gdx-backend-gwt-sources.jar
	DiamondTest-html/war/WEB-INF/lib/gdx-backend-gwt.jar
	DiamondTest/libs/gdx-sources.jar
	DiamondTest/libs/gdx.jar