updated settings to point to new database
merge branch with local changes