Merge branch 'dev'

Changes to the database. Changes to the config file.