new edit key: first version to add user ids
Swapped out FontawesomeText with normal ImageView
Added unlock icon, fixed drawer items, switched to icons from resource in drawer
Start work on a first-time wizard
Merge branch 'master' of github.com:open-keychain/open-keychain
More wizardry
Magic to find possible mails and names of device owner
Switched to the dark icons
Merge remote-tracking branch 'upstream/master'
Merge pull request #699 from da-kid/master

Partial fix for #597 (Navbar)
Change keybase submodule to our fork
Merge branch 'master' of github.com:open-keychain/open-keychain
Update subnodule keybase to fixed version of support libs
code cleanup and plurals in import log entries

closes #698
Update android gradle plugin to 0.12.0
Update git submodules for android gradle plugin to 0.12.0
Fix supertoast submodule
Try new travis hack
Update keybase lib
travis: update sdk