added modified versions of ConditionalModelBuilder.h** until resolved upstream.
Merge branch 'conditional' of github.com:zarquon42b/RvtkStatismo into conditional

Conflicts:
	src/BuildConditionalModel.cpp
use custom version of conditionalmodelbuilder