error in configmanager
fixed some minor bugs
fixed conflicts
Error in loading infinite number of config files solved
conflicts
Merge remote-tracking branch 'erik/master'