Work on subkeys adapter
Merge branch 'master' of github.com:open-keychain/open-keychain
cleanup
Fix nullpointer in API, fix #693
Fix OperationResultParcel

Naming conventions save lives... or atleast make addAll() work
Merge pull request #710 from mar-v-in/patch-1

Fix OperationResultParcel
Merge remote-tracking branch 'origin/master' into external-test

Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java