add master to development

Merged szaki requested to merge master into development

Created by: szakitom

Merge request reports