Add Database Configuration
Merge branch 'dev'