more reasonable waypoints for springdemo map
Merge branch 'master' into fixBugs