Updated controllers and templates
Merge branch 'master' of github.com:gabomarin/venta_web

Conflicts:
	Codigo/Controller/categoriaCtl.php
	Codigo/Model/categoriaBss.php