new PassphraseCache, storing UserIDs as well
Implemented Notification, no fallback yet
Added Purging for Android < 4.1
Put text into strings.xml, for internationalization
Fixed issues discussed in #713
Wello there, That's Java, not C^^
Fixed misplaced bracket
more work on edit key
Merge pull request #713 from da-kid/master

Added notification to passphrasecache
Merge branch 'master' of github.com:open-keychain/open-keychain
Fix strings from 'keys' to 'passphrases'
Merge remote-tracking branch 'origin/master' into external-test

Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java