agragado de sub-categoria
Merge branch 'master' of https://github.com/lferrigno/pulgas

Conflicts:
	codigo/log/backend_pulganzas_dev.log
	codigo/log/frontend_dev.log