new edit key: first version to add user ids
Merge pull request #692 from da-kid/master

Temporary fix for #648
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'