updated invitations handling & implemented adding user to buddylist
solved conflicts