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

Conflicts:
	foodinventory/src/main/java/se/chalmers/foodinventory/utils/InventoryItem.java