Merge branch 'pre-master'
Merge branch 'master' of https://github.com/valeraovalles/sait
placeholder
respaldo rama master
Merge branch 'master' of https://github.com/valeraovalles/sait
nomina
ordena contratos
Merge branch 'jhoan'
parrilla