oops
Merge branch 'rovereto' of https://github.com/robotology/codyco into rovereto