reconfigured, db connection
uppercased first letter
Merge branch 'develop'