Fixing hybrid logout
Merge pull request #185 from khawkins/fix_hybrid_logout

Fixing hybrid logout
Merge remote-tracking branch 'upstream/master' into unstable

Conflicts:
	hybrid/SalesforceHybridSDK/SalesforceHybridSDK/Container/SFContainerAppDelegate.m
	native/SalesforceSDK/SalesforceSDK/Classes/SFRestAPI.m
Merge pull request #186 from khawkins/unstable

Merging master into unstable
Merge remote-tracking branch 'upstream/unstable' into unstable20
Merge pull request #187 from khawkins/unstable20

Merging unstable into unstable20
Adding new cordova-ios fork/submodule
Backporting two bug fixes from Chatter's Implementation of OAuth

Disable UIWebView detector types to prevent phone numbers, contacts, addresses, etc from becoming linkified.
https://gus.salesforce.com/a07B0000000LgJ3IAK
http://codecollab.soma.salesforce.com:8080/go?page=ReviewDisplay&reviewid=174584
@rev sholly, jbovet@

Fix for login web view getting stuck
https://gus.salesforce.com/a07B0000000NEfeIAG
@rev mnachbaur@
Reverting doc changes
Merge pull request #189 from amody-sfdc/unstable

Backporting two bug fixes from Chatter's Implementation of OAuth
Merge remote-tracking branch 'origin/unstable' into unstable20
Merge pull request #191 from khawkins/unstable20

Merging unstable into unstable20
Updating to Cordova 2.3
More strict definition of contact options object in test app
Updating shared for a Cordova contacts fix
Merge pull request #192 from khawkins/cdv_23_upgrade

Upgrade to Cordova 2.3
Merge remote-tracking branch 'upstream/unstable' into unstable20
Merge pull request #193 from khawkins/unstable20

Merging unstable into unstable20
Moving strings from SFPasscodeViewController to resource bundle
Moved SalesforceSDK resources to shared