corrected db url
Merge branch 'server'