New fixes, servlet for database fill (need modification yet)
Merge branch 'master' of https://github.com/niralittle/Notus

Solve Conflict