Change-Id: I0000000000000000000000000000000000000005
Signed-off-by: jacobo <gilmith@gmail.com>

No se si conecta con los cambios

Change-Id: I0b18b05fee4dae497bbda5dd4036293dd5a4cc84
Change-Id: I0000000000000000000000000000000000000006
Merge remote-tracking branch 'origin/master'

Conflicts:
	comandos/src/com/opermerc/launcher/Conector.java
	comandos/src/com/opermerc/launcher/Ventana.java