update in inventory module
update in admin table
Merge pull request #17 from Gryphyn23/master

update in inventory module
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/inventory/models/InventoryHistory.php
	protected/modules/inventory/views/inventory/admin.php