Merge remote-tracking branch 'origin/master' into feature/share-dialog

Conflicts:
	actionscript/common/com/freshplanet/ane/AirFacebook/IAirFacebook.as
	actionscript/default/src/com/freshplanet/ane/AirFacebook/Facebook.as
	actionscript/src/com/freshplanet/ane/AirFacebook/Facebook.as
	android/res/values-es/strings.xml
	android/res/values-he/strings.xml
	android/res/values-iw/strings.xml
	android/res/values/attrs.xml
	android/res/values/com_facebook_attrs.xml
	android/res/values/com_facebook_strings.xml
	android/res/values/com_facebook_styles.xml
	android/res/values/facebook_attrs.xml
	android/res/values/facebook_strings.xml
	android/res/values/facebook_styles.xml
	android/res/values/strings.xml
	android/res/values/styles.xml
	android/src/com/facebook/AuthorizationClient.java
	android/src/com/facebook/Settings.java
	android/src/com/facebook/UiLifecycleHelper.java
	android/src/com/facebook/android/BuildConfig.java
	android/src/com/facebook/internal/Utility.java
	android/src/com/facebook/widget/FacebookDialog.java
	android/src/com/facebook/widget/FriendPickerFragment.java
	android/src/com/facebook/widget/GraphObjectAdapter.java
	android/src/com/facebook/widget/LoginButton.java
	android/src/com/facebook/widget/PickerFragment.java
	android/src/com/facebook/widget/PlacePickerFragment.java
	android/src/com/facebook/widget/ProfilePictureView.java
	android/src/com/facebook/widget/UserSettingsFragment.java
	android/src/com/facebook/widget/WebDialog.java
	android/src/com/freshplanet/ane/AirFacebook/AirFacebookExtensionContext.java
	android/src/com/freshplanet/ane/AirFacebook/LoginActivity.java
	android/src/com/freshplanet/ane/AirFacebook/WebDialogActivity.java
	android/src/com/freshplanet/ane/AirFacebook/functions/WebDialogFunction.java
	bin/AirFacebook.ane
	build/build.xml
	ios/AirFacebook.xcodeproj/project.pbxproj
	ios/AirFacebook/AirFacebook-Prefix.pch
	ios/AirFacebook/AirFacebook.h
	ios/AirFacebook/AirFacebook.m
restauring facebook-ios-sdk submodule