fix #2686: waypoint from notes are duplicated upon refresh
Merge branch 'release' into upstream

Conflicts:
	main/src/cgeo/geocaching/Geocache.java