Quick fixes to constructors
Merge branch 'dev_NL' into dev_LA2

Conflicts:
	SpaceSumo.sdf
	SpaceSumo.v11.suo
	SpaceSumo/Main.cpp
Config files update
Merge branch 'dev' into dev_LA2

Conflicts:
	SpaceSumo/SpaceSumo.vcxproj.filters
Config files working
Config update
Config fixes
Merge branch 'dev_NL' into dev

Conflicts:
	SpaceSumo.v11.suo
	SpaceSumo/Main.cpp
Config files syntax enhancement
config update
Random commit
Config can now save current settings
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
Merged dev into dev_NL