Taking sensitive data out of OAuth error logs
Merge pull request #637 from khawkins/remove_log_line

Taking sensitive data out of OAuth error logs
Merge remote-tracking branch 'origin/master' into unstable_merge
Merge pull request #638 from khawkins/unstable_merge

Mobile SDK: Merging master to unstable
Adding SmartSync lib to workspace
Move project into 'native' folder
Merge pull request #639 from bhariharan/smart_sync

Adding SmartSync lib to workspace
Adding functionality to logout all users
Reworking clearPasscodeState to behave as a synchronous, non-UI method
Rev'ing the SDK patch version
Merge pull request #640 from khawkins/logout_all_users

Logout all users
Merge remote-tracking branch 'upstream/master' into unstable_merge

Conflicts:
	shared/SalesforceSDKCore/SalesforceSDKCore/Classes/Common/SalesforceSDKConstants.h
Merge pull request #641 from khawkins/unstable_merge

Mobile SDK: Merging master to unstable
Adding SFUSerAccountManager delegate
Merge pull request #642 from khawkins/auth_manager_delegate_fix

Adding SFUSerAccountManager delegate
Merge remote-tracking branch 'origin/master' into unstable_merge
Merge pull request #643 from khawkins/unstable_merge

Mobile SDK: Merging master to unstable
Adding SFObjectType model classes
Fixing compile errors and adding util class
Merge pull request #644 from bhariharan/smart_sync

Adding SFObjectType class and a util class