more fixes on canonicalization and progress
fix bug in UploadKeyActivity, minor work on uri handling
Create key: design fixes
Merge branch 'master' of github.com:open-keychain/open-keychain
Fixes for upload
Remove private/secret key language from strings
move upload/update buttons from menu to buttons
lowercase all key ids from keyserver
Fix update from keyserver
Show revoked and expired for private keys
Merge branch 'master' of github.com:open-keychain/open-keychain
Show file tab only for import of existing keys
Use darker colors
Remove runtime check to fix passphrase service
Certifying instead of signing
Start fixing CachedPublicKeyRing
Merge branch 'master' into improve-file-more

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java