DB/Waypoints: Add some missing spawns and waypoints.
Merge remote-tracking branch 'origin/master' into mmaps