ContactHelper can read email addresses from contact list
Add ability to resolve HkpKeyserver from _hkp._tcp SRV record
Store origin with ImportKeysListEntry
Add hkps support
Fix url building to support certificate check on hkps servers

Note: the CA used by sks-keyservers.net is not valid for android, thus using hkps fails for them. pgp.mit.edu uses a perfectly valid cert.
Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYS
Make abstract methods in Keyserver public (implementations make them public anyway)
Store nice origin with keybase keys (that can't be interpreted as HKP server)
Merge branch 'hkps-support' into automatic-contact-discovery
Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYS
Store expired state within ImportKeysListEntry
First version of automatic contact discovery.

TODO:
- Configuration (much of it)
- Enabled by default?
- Which keys to import? Current state: All non-revoked and non-expired with matching userid
- Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?)
- Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes)
Fix regex for hkp parsing to support multiple uids
Merge branch 'master' into automatic-contact-discovery

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Make keylist case insensitive

You want "michael" to be next to "Michael", don't you?
import-log: add parcelable prototype
Show keys with android contacts

This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
Add dnsjava as submodule
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
Fix compile error introduced during merge