Fix add user to more groups in roster
Merge remote-tracking branch 'origin/master'