temporary changes in inventory
Merge branch 'master' of https://github.com/acacha/ebre-escool

Conflicts:
	application/modules/inventory/controllers/inventory.php