cambios
Commit
Merge branch 'master' of https://github.com/johelaq/SAB

Conflicts:
	SAB/UI/PantallaInicio.vb
arreglo