Algorithm improvements
Merge branch 'master' into algos

Conflicts:
	src/cws/core/simulation/Simulation.java