Update default.js
solucion de conflicto 2
solucion de conflicto 2
Update default.js
solucion de conflicto 5
Merge pull request #16 from mysterio56/master_dev

Update default.js
Update default.js
Merge pull request #17 from mysterio56/master_dev

Update default.js
Merge pull request #18 from mysterio56/master_qa

Master qa