fixes
Merge branch 'master' of
https://github.com/ClaudeSpeed/FoodCruiserSupply

Conflicts:
	src/main/java/at/ac/tuwien/workflow/camel/CamelMainClass.java
	src/main/java/at/ac/tuwien/workflow/camel/CruiseRouteBuilder.java