Respalod DB
Merge branch 'master' of ssh://who.gonzalezr.cl/home/armagedon/www into sebastian
Cambio de texto
Merge branch 'master' of github.com:SeGonzalezR/Armagedon into sebastian
Respaldo DB
Merge pull request #41 from SeGonzalezR/armagedon

Armagedon
Merge branch 'master' of github.com:SeGonzalezR/Armagedon
Merge pull request #42 from SeGonzalezR/armagedon

Ajustes filtro categorias en admin
Merge branch 'master' of github.com:SeGonzalezR/Armagedon
Ajuste modulos home con precio 0
Merge branch 'master' of ssh://who.gonzalezr.cl/home/armagedon/www into armagedon
Cambios de textos
Fix select agregar monto pagado