fixed error message
neatness refactoring
do respect expectedFingerprint during key import
fix bug with bad verifying master keys
ui: do show Certify identities button even for secret keys

Closes #636
Don't show full fingerprint in key search results
Merge pull request #645 from timbray/master

Don't show full fingerprint in key search result lists
Clean up keyimport.ImportKeysListEntry
Merge pull request #646 from timbray/master

Clean up keyimport.ImportKeysListEntry
Merge branch 'master' into automatic-contact-discovery

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java