Project file changes to support archiving
Merge pull request #546 from khawkins/archive_header_paths

Project file changes to support archiving
Merge remote-tracking branch 'origin/master' into unstable

Conflicts:
	native/SampleApps/NativeSqlAggregator/NativeSqlAggregator.xcodeproj/project.pbxproj
	shared/SalesforceNetworkSDK
Merge pull request #547 from khawkins/unstable

Mobile SDK: Merging master into unstable