ConfigFile (OL?) change
Merge branch 'master' of http://github.com/RhobanProject/Utils

Conflicts:
	configfile/ConfigFile.cpp