Modify rosterGroup/List.xhtml
Merge remote branch 'origin/master'