edit report, activities
Merge branch 'develop' of https://github.com/AltyntauSource/Docflow.git