Merge origin/master

Conflicts:
	datosTraficoSerializado.txt
	datosTraficoTexto.txt
	src/pe/edu/pucp/linelight/view/PanelSimulacionMonitoreo.form
	src/pe/edu/pucp/linelight/view/PanelSimulacionMonitoreo.java
Merge origin/master