merge to thanhbranch

added friendlist