add create key capabilities to SaveKeyringParcel
edit key: part 3
don't use zero plural string for english

closes #703
forgot a line in previous commit
update spongycastle to include addSubkeyBindingCertification
fix subkey addition
use expert create key for key creation testing (revert this later on!)
Edit key: adding user ids
Add infographic from FSFE
Merge branch 'master' of github.com:open-keychain/open-keychain
edit key: work on saving
support changing primary user id in SaveKeyringParcel

Closes #695
Merge branch 'create-keyring'
Merge remote-tracking branch 'origin/master'
remove init methods from adapter
fix nullpointer, cleanup
merge KeychainIntentService
Update spongycastle
A little bit less purple
Remove unnecessary error logs