Merge remote-tracking branch 'origin/newgen-keznikl' into newgen-kit
Merge remote-tracking branch 'origin/newgen-keznikl' into newgen-kit
After merging
latest eval script from bravo
Merge remote-tracking branch 'origin/newgen-kit' into newgen-keznikl

Conflicts:
	jdeeco-simulation-demo/evaluate.py