Adding support for incompatible connected app versions
Merge pull request #208 from khawkins/connected_app_version_error

Adding support for incompatible connected app versions
Merge remote-tracking branch 'upstream/master' into connected_app_version_updates

NB: Initial merge of master into unstable.  More changes to come.

Conflicts:
	dist/SalesforceOAuth/SalesforceOAuth-Debug.zip
	dist/SalesforceOAuth/SalesforceOAuth-Release.zip
	dist/SalesforceSDK/SalesforceSDK-Debug.zip
	dist/SalesforceSDK/SalesforceSDK-Release.zip
	hybrid/SalesforceHybridSDK/SalesforceHybridSDK/Container/SFContainerAppDelegate.m
	native/SalesforceSDK/SalesforceSDK/Classes/NativeApp/SFNativeRestAppDelegate.m
	native/SalesforceSDK/SalesforceSDK/Classes/SFRestAPI.m
Interim checkin
Localizing OAuth strings, reorg of other l12n
Commiting binary changes, making SFSDKResourceUtils public
Merge pull request #210 from khawkins/connected_app_version_updates

Connected app updates (master -> unstable and more)