fix #2956: management of release notes
Merge branch 'release' into upstream

Conflicts:
	main/res/values/strings_not_translatable.xml
	main/src/cgeo/geocaching/AboutActivity.java
Test master changelog information