Feature/edited text

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

Closes #1 (closed).

Merge request reports