added check if InventoryItem is already present in createSportsEquipment
added check if InventoryItem is already present in createSportsEquipment
Merge branch 'nadja' of https://github.com/C0nsultant/swtp-rebuild into nadja
corrected method setWatermeter() in InventoryController
Merge branch 'master' into nadja

Conflicts:
	src/main/java/de/tudresden/inf/swt14w31/inventorymanagement/InventoryItemRepository.java
deleted java.orig file
added check if InventoryItem is already present in createSportsEquipment
added check if InventoryItem is already present in createSportsEquipment
deleted java.orig file
Merge branch 'nadja' of https://github.com/C0nsultant/swtp-rebuild into nadja