Add user ranking
Merge branch 'feature/user-ranking' into staging/master