add some logic
Merge branch 'master' into lopv2

Conflicts:
	facebook-android-sdk-3.5.2/facebook/bin/facebooksdk.jar