Little differences
Merge remote-tracking branch 'origin/master'

Conflicts:
	object_simulation/world_simulation.py
Configuration class begun.