Fix test due to the new waypoint id stability
Merge branch 'release' into upstream

Conflicts:
	tests/src/cgeo/geocaching/files/GPXParserTest.java