'Estabilizacion de TC's'
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/ts/libraries/ServicioDeApoyo.java
	src/test/java/com/ts/main/Comandos.java