added the teammates sorting to work
Merge branch 'bootstrap' of https://github.com/TEAMMATES/repo into bootstrap