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

Conflicts:
	files/makeMeCoffee/simulation.xml
	trajectoryrobot2d/src/specificworker.cpp
	trajectorytester/src/specificworker.cpp
Merge branch 'master' of https://github.com/robocomp/robocomp-ursus-rockin