Merge pull request #11 from mysterio56/master_prod

Master prod to master
Merge pull request #19 from mysterio56/master_dev

Master dev
Update default.js
conflicto horas
Update default.js
Merge pull request #22 from mysterio56/master

horas
horas bien
solucion de conflicto
Merge pull request #25 from mysterio56/master_dev

Update default.js
Update default.js
sin conflicto}
Merge branch 'master_dev' into master_qa
Merge branch 'master_dev' into master_qa
Update default.js
sin conflicto