conflictos

Conflicts:
	application/controllers/productos.php
	application/views/venta_form.php

Schedule
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	application/controllers/productos.php
	application/views/venta_form.php