move classes around a bit
make FileImportCache generic, iterable, and add unit test
remove debug output about security providers (cleaner unit tests)
fix dumb mistake in modifySecretKey
Add user id with dialog
Again update submodules
Merge branch 'master' of github.com:open-keychain/open-keychain
Merge branch 'master' into yubikey