adjusted database config file
Merge branch 'robin'