Changed display order of academic years
Merge branch 'master' into dev-fak