commented out test database config
Merge branch 'merge-ui-updates' into develop