fix duplicate dialog item
Merge branch 'friendList' into phase1