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
Merging unstable to unstable20
Merge pull request #183 from khawkins/unstable20

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

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

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

Merging unstable into unstable20
Merge remote-tracking branch 'upstream/unstable' into unstable20

Conflicts:
	dist/SalesforceSDK/SalesforceSDK-Debug.zip
	dist/SalesforceSDK/SalesforceSDK-Release.zip
	hybrid/SalesforceHybridSDK/SalesforceHybridSDK/Container/SFContainerAppDelegate.m
Merge pull request #195 from khawkins/unstable20

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

Merging unstable into unstable20