reworking sorting
Merge branch 'master' of https://github.com/elsys/gradsys