Fixed type error in config manager
Fixed type error in config manager
Merge branch 'master' into devel

Conflicts:
	libs/ConfigManager.py