Bugfixing

Stephanie Schlarb requested to merge dev_bugfixing_DocumentTemplate into dev

Merge request reports