1st commit
Merge branch 'master' of https://github.com/tungha/DiamondTest into chord

Conflicts:
	DiamondTest/.classpath
Ready to battle
Merge branch 'master' of https://github.com/tungha/DiamondTest into chord

Conflicts:
	DiamondTest-android/src/com/cnc/diamond/MainActivity.java
	DiamondTest/src/com/cnc/diamond/Diamond.java
	DiamondTest/src/com/cnc/diamond/LibgdxGame.java
hotfix
Merge branch 'master' of https://github.com/tungha/DiamondTest into chord

Conflicts:
	DiamondTest/src/com/cnc/diamond/components/Game.java
Finish Demo Chord
recode the log
Change to effect
Merge branch 'master' of https://github.com/tungha/DiamondTest into chord

Conflicts:
	DiamondTest-desktop/src/com/cnc/diamond/TestMain.java
	DiamondTest/src/com/cnc/diamond/components/Game.java