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

Conflicts:
	etc/ursusMM.xml