Sync with visp_naoqi library
Fix merging issues