add info to roster
Fix merge conflicts
Merge branch 'shrsp-master'