top section of the page
Merge branch 'issue-2' into develop
Fixed db connection warning