Closed db connection after each request
Merge branch 'server' into develop
Merge branch 'develop'