Feature/edited text

Merged Michelle Weidling requested to merge feature/edited-text into develop

Merge request reports