Merge pull request #171 from khawkins/unstable20_merge

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

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

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

1.4 README updates
Rev'ing unstable version, merging 1.4.1 patch
Merge pull request #182 from khawkins/unstable_merge

Rev'ing unstable version, merging 1.4.1 patch
Merging unstable to unstable20
Merge pull request #183 from khawkins/unstable20

Merging unstable into unstable20
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