Add sorting to users by their scores
Fix user week sort
Merge branch 'master' into scoreboard