Updating default encryption scheme
Adding no-store Cache-Control directive to API requests.
Updating shared submodule (forcetk updates)
Merge pull request #376 from khawkins/update_default_encryption

Updating default encryption scheme
Merge remote-tracking branch 'upstream/master' into unstable_merge

Conflicts:
	external/shared
	shared/SalesforceOAuth/SalesforceOAuth.xcodeproj/project.pbxproj
	shared/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKConstants.h
Merge pull request #377 from khawkins/unstable_merge

Merging master into unstable