prepare to pull from new server
add server dump
dumb db
remove old db
add some api to server manager
add some time out
deploy new server
Merge branch 'master' into lopv2

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