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

Conflicts:
	TofEstimation/doku/noiseConstFlow.py
	TofEstimation/main.py