Db merge

Adam Matoľák requested to merge db into master

Merge request reports