fixes
Merge branch 'master' of https://github.com/RRozza/Simulador

Conflicts:
	FBM/Camino.cpp
	datos/test/Visor/Logs/LogVisor.xml
a no agregar el suo!!