Client changes.
Merge remote-tracking branch 'origin/Simplification' into Simplification
Fixed RosterList and Buttons