comentarios de innermodel fuera
Merge branch 'master' of https://github.com/robocomp/robocomp

Conflicts:
	files/components-port.txt
	libs/innermodel/innermodel.cpp