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

Conflicts:
	files/RoCKIn@home/world/rockin.xml
	trajectoryrobot2d/src/specificworker.cpp