Adapt world waypoints to new position naming scheme. Fixes #138.
Merge branch 'release-2.0.0' of git://github.com/Secretchronicles/SMC into devel