test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/factory/CognacFactoryDataInitializer.java
	src/main/java/factory/controller/CookBookController.java
	src/main/java/factory/model/LocationManagement.java
	src/main/java/factory/model/WineStock.java