...
Merge branch 'master' of https://github.com/flachschipper/master_python

Conflicts:
	TofEstimation/algos/tofChains.py
	TofEstimation/doku/ats24Test.py
	TofEstimation/doku/noiseConstFlow.py
ussDiag