minor bug fix in average calculations
Merge branch 'new-tutor-report'
Merge branch 'master' into ada-api