Fixed null pointer on load gpx file
Merge branch 'sherpafy'
Merge pull request #865 from Bars107/master

Fixes to sherpafy.