fix db config
Merge branch 'master' of local repository into mglaubitz
Merge branch 'master' of local repository into mglaubitz