Merge branch 'hotfix/database.yml'
screenshot
Merge branch 'hotfix/readme' into develop