Merge remote-tracking branch 'remotes/origin/newgen-kit' into newgen-keznikl
Some updates

Conflicts:
	jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java