Add equip/unequip functionality for Inventories
Merge pull changes