fix #2391: NPE in map
Merge remote-tracking branch 'origin/release'

Conflicts:
	main/src/cgeo/geocaching/maps/CGeoMap.java