Changed code to reflect changes in database
Merge branch 'javadb' of https://github.com/aydex/IT1901-Gruppe11