Merge pull request #865 from Bars107/master

Fixes to sherpafy.
Fix additional
Merge branch 'master' of ssh://github.com/osmandapp/Osmand
NPE
Added sound for approaching and announcing waypoint. Fixed bug with wrong approaching distance
Merge branch 'master' of https://github.com/osmandapp/Osmand
Merge branch 'sherpafy'