[Server][Roster] User -> Contact.
[Server][Client][Roster] Change comments, and some tiny changes.