Prefer composition to inheritance is the mantra these das
work in progress
actually canonicalize
add toString for test ease
Merge pull request #708 from artbristol/composition-not-inheritance

Prefer composition to inheritance
work in progress
actually canonicalize
add toString for test ease
data fixes
add the GPG version
Actually test canonicalize
get rid of AppMsg library
use SuperToast instead of AppMsg in code, part 1
use SuperToast instead of AppMsg in code, part 2
Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
add diffKeyrings method
use KeyringTestHelper.diffKeyrings method for unit test
add diffKeyrings method
use KeyringTestHelper.diffKeyrings method for unit test

Conflicts:
	OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
(c) headers, tidy imports