Added delete waypoint functionality
Merge branch 'waypoints'