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

Conflicts:
	SpaceSumo/config.cfg
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo.v11.suo
Swaped assert for SAssert with correct messages