Merge branch 'rewrite'

Conflicts:
	src/main/java/net/pleiades/Distributor.java
	src/main/java/net/pleiades/simulations/selection/SimulationSelector.java
	src/main/java/net/pleiades/simulations/selection/UniformUserSelector.java
	src/main/java/net/pleiades/tasks/executor/TaskExecutor.java