changed the way the configuration files are handled
Merge branch 'mantis-139' into dev