Encrypting user account data on the filesystem
Merge pull request #671 from khawkins/user_account_encryption

Encrypting user account data on the filesystem
Merge remote-tracking branch 'origin/master' into unstable_merge
Merge pull request #674 from khawkins/unstable_merge

Mobile SDK: Merging master to unstable