rename KeyServerUploadActivity to UploadKeyActivity
Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain