Creating grades report. REFS #26
Solving conflicts
Merge branch '2.3.x'