Merged with origin master(2)!

Also:

Merge branch 'master' of https://github.com/verlab/super_mario_soccer_base into rabbitsoccer

Conflicts:
	smsoccer/world/world_model.py