Merge pull request #233 from khawkins/unstable

Merging master into unstable
Fixing InAppBrowser for hybrid SDK
Merge pull request #238 from khawkins/fix_inappbrowser

Fixing InAppBrowser for hybrid SDK
Merge remote-tracking branch 'origin/master' into unstable

Conflicts:
	hybrid/SalesforceHybridSDK/SalesforceHybridSDK/Container/SFContainerAppDelegate.m
	native/SalesforceSDK/SalesforceSDK/Classes/SFRestAPI.m