Conflicts: Makefile include/UDPInterface.h slsReceiver/Makefile slsReceiver/eigerReceiver/eigerReceiver.cpp slsReceiver/eigerReceiver/eigerReceiverDummy.cpp slsReceiver/eigerReceiver/eigerReceiverTest.cpp