Partial database connectivity
Merge branch 'develop' of https://github.com/dan-bell/softeng-java-application into develop