mezcla
Merge branch 'master' of github.com:SergioCC14/Store4SoftPatt

Conflicts:
	build/classes/aplicacion/AsignarTrabajoListaTecnicos.form