shop done
b4 merge
online rush
Merge branch 'master' into lopv2

Conflicts:
	DiamondTest/src/com/cnc/diamond/Diamond.java
	DiamondTest/src/com/cnc/diamond/adapter/DiamondInternetManager.java
	DiamondTest/src/com/cnc/diamond/battle/BattleModel.java
	DiamondTest/src/com/cnc/diamond/battle/ServerAdapter.java
	DiamondTest/src/com/cnc/diamond/components/OnlineScreen.java
	facebook-android-sdk-3.5.2/facebook/bin/facebooksdk.jar