Fixed setters
Merge remote-tracking branch 'origin/BetterCfgFileSys' into Tracking&CodeBase

Conflicts:
	src/Configuration/ConfigurationManager.hpp