Moved waypoints code from locationPorvider to WaypointHelper
Hotfix
Merge pull request #827 from Bars107/refactor

Refactor. Added waypoints helper.