[project] database configuration
Merge branch 'develop'