wrapped-key-ring: first steps, get rid of key imports in decryptverify and signencrypt
certification is always done with the master key
wrapped-key-ring: move certification logic into secretkey
wrapped-key-ring: move more helper methods into keys
wrapped-key-ring: forgot to add UncachedKeyRing class
wrapped-key-ring: small fix to make it work again
wrapped-key-ring: more refactoring - no more pgp imports in KeychainIntentService!
wrapped-key-ring: no more pgp imports in PassphraseDialogFragment
wrapped-key-ring: view certify
wrapped-key-ring: cached data revamp
wrapped-key-ring: redesign underlying CachedKeyRing
wrapped-key-ring: introduce Uncached*Key objects
wrapped-key-ring: more work on passphrase caching and certification
wrapped-key-ring: get rid of bc objects in key editor
wrapped-key-ring: remove more unneeded methods
Merge remote-tracking branch 'origin/master' into wrapped-key-ring

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
	OpenKeychain/src/main/res/values/strings.xml
wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing
use long rather than String to build uris by key
wrapped-key-ring: use CachedKeyRing where possible
Merge remote-tracking branch 'origin/master' into wrapped-key-ring

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java