Changed the database name in the database settings files
Merge branch 'master' into data-import