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

Conflicts:
	TofEstimation/ui/browseUs.py