Mejoras visuales
Merge branch 'desarrollo' of https://github.com/dcarrasco/inv-fija into desarrollo

Conflicts:
	application/views/ORM/orm_listado.php
	application/views/inventario/sube_stock.php