Bug Fix #380826: Fixed class order by ordering first by class name and t...

...hen by curricular year.