correcciones ventas
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	application/models/productos_model.php
	application/views/inicio.php
conflictoos