Merge branch 'sara'
Merge branch 'master' into linnea
Merge branch 'master' into linnea
More functionality and changes to InventoryItem
Merge branch 'linnea' into sara