adding separate config file for connection
Merge branch 'master' into fit-restructure