arrange db settings
mailcatcher
Merge branch 'master' into user_settings