Updated the settings files for the new database server
Merge branch 'master' into data-import