tipo1
Merge remote-tracking branch 'origin/master'
Avance tabla tipo trabajo
Merge remote-tracking branch 'origin/master'
Reparacion de colapso de pantallas
Merge remote-tracking branch 'origin/master'