Fixed uom
Merge branch 'master' of github.com:robotology-playground/codyco-deliverables