Merge remote-tracking branch 'origin/master' into db-overhaul
db-overhaul: workaround api level 11
db-overhaul: fix DecryptAndVerify with and without known keys
ViewKeyMainFragment cleanup (don't use inline queries!)
db-overhaul: fix delete key from ViewKeyActivity
Simplify PassphraseDialogFragment usage

Move boiler plate code into a simple static show() method, which only
requires a Handler and can be used ad hoc in any FragmentActivity.
Merge pull request #512 from thi/simplify-passphrase-dialog-creation

Simplify passphrase dialog creation
db-overhaul: fix key export (and some export-related ui changes)
Merge remote-tracking branch 'origin/master' into db-overhaul