Fixed Roster bug
Merge branch 'dev'