Merge pull request #720 from khawkins/unstable

Merging unstable30 into unstable
Making user accounts unique to userID/orgID
In progress: changing over to user identity from user id
Finalizing user identity update implementation
Updating unit tests to support new account identity
Adding some tests around account identities
Active identity upgrade scenarios, tests
Merge pull request #721 from khawkins/user_org_update

Updating user account identities to be unique to both UserID and OrgID
Fixing SFUserAccount usage in hybrid (from account identity updates)
Merge pull request #722 from khawkins/fix_user_accounts_hybrid

Fixing SFUserAccount usage in hybrid (from account identity updates)
Adding passcode-related category to UIApplication
Merge pull request #723 from khawkins/fix_hybrid_passcode

Adding passcode-related category to UIApplication
Merge remote-tracking branch 'origin/master' into unstable_merge
Merge pull request #724 from khawkins/unstable_merge

Mobile SDK: Merging master to unstable
Updating SalesforceNetworkSDK submodule
Merge pull request #725 from khawkins/original_rest_errors

Updating SalesforceNetworkSDK submodule
Merge remote-tracking branch 'upstream/master' into unstable
Updating Network SDK submodule pointer