Issue #95: Adding scholarships to grades report
Merge branch 'master' of https://github.com/gems-uff/sapos