small improvement -- added the possibility to distinguish between program traces and other evidence
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/languages/com.mbeddr.analyses/languages/com.mbeddr.analyses.cbmc.rt/models/com/mbeddr/analyses/cbmc/rt/counterexample_lifted.mps