waypoints stories
Merge remote-tracking branch 'origin/PathWaypoints'

Conflicts:
	GoUP/WebContent/resources/js/map.js