Merge pull request #240 from khawkins/unstable20

Merging unstable into unstable20
App update crash, invalid host crash
Merge pull request #242 from khawkins/bug_fixes

App update crash, invalid host crash
Merge remote-tracking branch 'origin/master' into unstable

Conflicts:
	dist/SalesforceSDK/SalesforceSDK-Debug.zip
	dist/SalesforceSDK/SalesforceSDK-Release.zip
	hybrid/SalesforceHybridSDK/SalesforceHybridSDK/Container/SFContainerAppDelegate.m
	native/SalesforceSDK/SalesforceSDK/Classes/SFRestAPI.m
Merge pull request #243 from khawkins/unstable

Merging master into unstable
Merge remote-tracking branch 'origin/unstable' into unstable20

Conflicts:
	dist/SalesforceSDK/SalesforceSDK-Debug.zip
	dist/SalesforceSDK/SalesforceSDK-Release.zip
	shared/Classes/Common/SFApplication.m