add interpolation function that takes joint velocities into account, generalize setDiffFromIK
resolve merge conflict
Merge remote-tracking branch 'main/groovy-devel' into groovy-devel