Merge branch 'master' into FDroid

Merge branch 'FDroid' of https://github.com/k3b/ContentProviderHelper …

…into FDroid

Conflicts:
	README.md

prepare docs for first fdroid release

Update README.md