update funf and motion converters
Merge branch 'dev-kelly' into dev
Merge remote-tracking branch 'origin/dev' into dev