Merge pull request #38 from SeGonzalezR/sebastian

Ajustes, mejoras y nuevas cosas!
Merge pull request #39 from SeGonzalezR/sebastian

Product_type.
Merge pull request #40 from SeGonzalezR/sebastian

Imagenes Scaneadas
Cambios
Respaldo DB
Cambios locales
Merge branch 'master' of ssh://who.gonzalezr.cl/home/armagedon/www
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
Cambios Calculos totales en dashboard
Merge branch 'armagedon' of github.com:SeGonzalezR/Armagedon into armagedon
Merge pull request #41 from SeGonzalezR/armagedon

Armagedon
Merge branch 'master' of github.com:SeGonzalezR/Armagedon
Ajustes filtro categorias en admin
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