resync before adding edge function
Merge branch 'master' of github.com:batu/robot-motion