get rid of AppMsg library
use SuperToast instead of AppMsg in code, part 1
use SuperToast instead of AppMsg in code, part 2
Program flow fixes
Update libs
test and fix: adding an empty user id should fail
tests: add a couple of UncachedKeyRing.merge tests
fixes for extractPublicKeyRing, update SpongyCastle
UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings
Merge remote-tracking branch 'origin/master'
test: (almost) full coverage for UncachedKeyRing.merge
test: don't need commutativity parameter here after all
test: small code cleanup
test: add misc UncachedKeyRing tests
generic UncachedKeyRing fixes
test: add tons of tests and fuzzing for UncachedKeyRing.canonicalize
canonicalize: couple of fixes
Merge branch 'master' into ditch-appmsg

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
some more work on supertoast and result parcel stuff
introduce EditKeyResult with transient UncachedKeyRing (half-baked!)