Updated waypoints
Merge branch 'develop' of github.com:openeyes/cnd into develop