Merge DataBase to development

Schuh Martinrequested to merge
DataBase into development

Cosmetic changes and minor functional changes

Merge request reports