Merge branch 'master' of https://github.com/facebook/facebook-ios-sdk

Conflicts:
	src/FBRequestConnection.m
	src/FacebookSDKResources.bundle/FBDialog/images/fbicon.png
	src/FacebookSDKResources.bundle/FBLoginView/images/facebook.png
	src/FacebookSDKResources.bundle/FBLoginView/images/login-button-small-pressed.png
	src/FacebookSDKResources.bundle/FBLoginView/images/login-button-small-pressed@2x.png
	src/FacebookSDKResources.bundle/FBLoginView/images/login-button-small.png
	src/FacebookSDKResources.bundle/FBLoginView/images/login-button-small@2x.png