distillation
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/factory/CognacFactoryDataInitializer.java
	src/main/java/factory/controller/DistillationController.java
	src/main/resources/templates/cookbook.html
	src/main/resources/templates/distillation.html