merged changes from antoine
drive waypoint module (which isn't actually a modules (yet) huehuehue)
Merge branch 'drive-rewrite' of github.com:froj/nastya into drive-rewrite