additional waypoints and personal note in gpx files, based on Schrottie
code
Merge branch 'gpx' into next