new-edit: remove old save keyring stuff
new-edit: add new save keyring stuff
new-edit: add logging to modifySecretKeyRing operation
generate public keyring from secret if not available
Merge branch 'new-edit'

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/res/values/strings.xml
Merge remote-tracking branch 'origin/master'