Implemented zmq proxy instead of using one tcp socket per thread
bugfix: calculated threadnum but didnt use it afterwards
Added high water mark to the receiver socket
fixed merger.conf
merged merger.conf