add buttons in edit key
Rename adapter
Merge branch 'master' of github.com:open-keychain/open-keychain
new edit key: diff for existing user ids
new edit key: change passphrase
Handle empty keybase.io query, should fix #675
Disable pre-dexing, causes exceptions on some systems
Merge pull request #681 from timbray/master

Handle empty keybase.io query, should fix #675
remove margin in import keys (leftover from nav drawer)
Fixed Issue #683 which caused OK to crash upon importing keys which contain percent signs.
Merge branch 'master' of https://github.com/da-kid/open-keychain
Merge pull request #684 from da-kid/master

Fix of #683
Merge pull request #686 from mar-v-in/minidns

Use minidns instead of dnsjava
Merge branch 'master' into hkps-by-default