...........
Merge branch 'master' of https://github.com/robocomp/robocomp-ursus-rockin

Conflicts:
	files/RoCKIn@home/world/rockinSimple.xml
	inversekinematicsComp/src/specificworker.cpp
Merge branch 'master' of https://github.com/robocomp/robocomp-ursus-rockin

Conflicts:
	files/RoCKIn@home/world/rockinSimple.xml
	trajectoryrobot2d/src/specificworker.cpp
Merge branch 'master' of https://github.com/robocomp/robocomp-ursus-rockin
Merge branch 'master' of https://github.com/robocomp/robocomp-ursus-rockin
Merge branch 'master' of https://github.com/robocomp/robocomp-ursus-rockin
Añadido fichero de prueba Muebles.xml