ConflictTest
Added Config and filter Block
Added config and filter block
Merge branch 'master' of
https://github.com/tobiasvdp/industrialProcessing.git