skill buy on developing
Merge branch 'master' into lopv2

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