ticket:4
Merge branch 't4_facebook_friends_list'

Conflicts:
	CoffeeCupsTest/src/com/coffeecupstest/Fragments/EditUserDataFragment.java
	facebook-android-sdk-3.0.2/facebook/bin/classes/com/facebook/Session$AuthorizationRequest.class
	facebook-android-sdk-3.0.2/facebook/bin/classes/com/facebook/widget/FacebookFragment$DefaultSessionStatusCallback.class
	facebook-android-sdk-3.0.2/facebook/bin/classes/com/facebook/widget/FacebookFragment.class
	facebook-android-sdk-3.0.2/facebook/bin/classes/com/facebook/widget/LoginButton$LoginButtonProperties.class
	facebook-android-sdk-3.0.2/facebook/bin/facebooksdk.jar