Merge branch 'master' into eiger_receiver

Conflicts:
	include/slsReceiverTCPIPInterface.h
	slsReceiver/slsReceiver.cpp
	src/UDPStandardImplementation.cpp
	src/slsReceiverTCPIPInterface.cpp

it compiles

slsReceiverSoftware/include/sls_receiver_defs.h

@@ -55,7 +55,9 @@ public:
 		GOTTHARD, /**< gotthard */
 		PICASSO, /**< picasso */
 		AGIPD, /**< agipd */
-		MOENCH /**< moench */
+		MOENCH, /**< moench */
+		JUNGFRAU, /**< jungfrau */
+		JUNGFRAUCTB /**< jungfrauCTBversion */
 	};
 
 
@@ -85,7 +87,9 @@ public:
 		MEASUREMENT_TIME,  /**< Time of the measurement from the detector (fifo) */
 
 		PROGRESS, /**< fraction of measurement elapsed - only get! */
-		MEASUREMENTS_NUMBER
+		MEASUREMENTS_NUMBER,
+		FRAMES_FROM_START,
+		FRAMES_FROM_START_PG
 	};