config update
Config can now save current settings
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo.v11.suo