Merge origin/master

Conflicts:
	src/warehousemodel/Item.java