Update shared and revert to non-prod version
Update shared commit
Change version to 2.1.0
Fix version
Add previous version back
Merge pull request #362 from bhariharan/unstable

Update shared and revert to non-prod version
Library reorg

Changing a few things about the way the libraries are staged for building and consumption:

- Moving header search path configuration from "User header search paths" to "Header search paths".
- All library header files will now be deployed in Headers/[Project Name].
- Moved the copying of header files into a proper "Copy Header Files" build phase.
- Changed the build configuration to work with the 'install' action.

There's not a lot of net difference in the creation and consumption of the library archives; the new location of the header files is about it.  The native and hybrid templates have been updated to point to the new header file location.
Updating npm build branch to point to unstable (no longer unstable20)
Merge pull request #364 from khawkins/fix_npm_build

Updating npm build branch to point to unstable (no longer unstable20)
Updating to latest Cordova commit
Merge pull request #365 from khawkins/library_reorg

Reorganizing the SDK library builds a bit
Changing the npm build to overwrite existing files
Merge pull request #366 from khawkins/fix_npm_build

Changing the npm build to overwrite existing files
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
Updating ThirdPartyDependencies submodule pointer
Merge pull request #379 from khawkins/unstable

Updating ThirdPartyDependencies submodule pointer
Miscellaneous cleanup items

- Changed build to use the `build` target of `xcodebuild`, rather than `install`, since the latter will strip debug symbols, no matter what the project configuration says.
- Moved the install and header path values for OAuth up to the project level, from the target level.
Merge pull request #380 from khawkins/misc_cleanup

Miscellaneous cleanup items
Amending OAuth encryption to differentiate access and refresh token storage