Merge pull request #649 from bhariharan/unstable

Merge branch 'master' into unstable
Fix physical location of SmartSync files
Merge pull request #650 from bhariharan/smart_sync

Fix physical location of SmartSync files
Adding SFSoslBuilder, SFSoqlBuilder, and SFSoslReturningBuilder implementation
Merge pull request #651 from bhariharan/smart_sync

Adding SFSoslBuilder, SFSoqlBuilder, and SFSoslReturningBuilder implementation
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
Moving the assignment of identity data
Merge pull request #656 from khawkins/move_identity_assignment

Moving the assignment of identity data
Merge remote-tracking branch 'origin/master' into unstable_merge
Merge pull request #657 from khawkins/unstable_merge

Mobile SDK: Merging master to unstable
Consolidate all constants in one place
Bringing in bug fix from internal git
Renaming to SFSmartSyncConstants
Merge pull request #658 from bhariharan/smart_sync

Consolidate all constants in one place
Merge pull request #659 from bhariharan/master

Bringing in bug fix from internal git
Merge branch 'master' into unstable