Merge pull request #223 from khawkins/encryption_updates

Refactor to passcode provider, add PBKDF2 provider
Merge pull request #226 from khawkins/encryption_updates_plus_auto_update

Management of encryption providers in the app
Merge pull request #227 from khawkins/clear_cookies_native

Clear cookies on native and hybrid
Merge remote-tracking branch 'upstream/unstable' into fix_identity_data
Fixing Cordova XHR caching issues