Random commit
Merge branch 'dev' of https://github.com/Ryxali/SpaceSumo into dev

Conflicts:
	SpaceSumo/config.cfg