Cambios visuales en panel de control
Cambios visuales en panel de control
Merge remote-tracking branch 'origin/TerminalsUI1.2' into TerminalsUI1.2

Conflicts:
	factory/controlPanel.js