Minor changes
Merge branch 'master' of https://github.com/robotology-playground/codyco-deliverables