change port server to 7998
fix testmain.java
add html 5 game
redeploy game
add some config to game html
simple games list
Merge branch 'master' into lopv2

Conflicts:
	DiamondTest/src/com/cnc/diamond/adapter/DiamondServerManager.java
	DiamondTest/src/com/cnc/diamond/battle/BattleModel.java
	DiamondTest/src/com/cnc/diamond/components/OnlineScreen.java
	DiamondTest/src/com/cnc/diamond/online/CharacterManagementApi.java
	facebook-android-sdk-3.5.2/facebook/bin/facebooksdk.jar