update report
Merge branch 'feature/progress_report' into develop