no message
Merge branch 'master' of https://github.com/purcaro/bib-cpp

Conflicts:
	src/programs/simulator/simulatorRunner.cpp
	src/seqTools/objects/seqObjects/cluster.cpp