changed package name to dbEntries
fixed merge overwrite of tests
fixed imports
fixed errors risen by changes
Merge branch 'database' of github.com:utwente-di/di18 into Tests
Merge branch 'database' of github.com:utwente-di/di18 into Tests
Fixed TestUser