Fixed Exceptions in tests for LiquidProcessor
Merge branch 'test-liquid-processor'

Conflicts:
	src/server/src/main/java/disastercontrol/processor/LiquidProcessor.java

Used master version for conflicted file.