Prepare online playing
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