Rename provider types following http://developer.android.com/guide/topics/providers/content-provider-creating.html
Merge branch 'master' of github.com:open-keychain/open-keychain
Update comments in AndroidManifest