Some changes from branch 'workingDemoCodyco' to 'master'
Merge branch 'master' of https://github.com/robotology/codyco