Home GnuPG

Merge branch 'work/tfry/reencrypt_ui'