Adding ability to customize SmartStore encryption
Merge pull request #653 from khawkins/custom_ss_key

Adding ability to customize SmartStore encryption
Merge remote-tracking branch 'origin/master' into unstable_merge

Conflicts:
	shared/SalesforceSDKCore/SalesforceSDKCore/Classes/SmartStore/SFSmartStore.h
Merge pull request #654 from khawkins/unstable_merge

Mobile SDK: Merging master to unstable