pasar

file conf changed
Merge branch 'master' of https://github.com/robotology/wysiwyd