Random generator: 1 controller per partition
Merge
Merge branch 'master' into HEAD

Conflicts:
	simulation0111/random_generator.py