Evaluate update
Merge remote-tracking branch 'origin/newgen-keznikl' into newgen-kit

Conflicts:
	jdeeco-simulation-demo/evaluate.py
complex scenario eval and bugfixes