Modify AddFriendContainer and JoinQunContainer
Merge remote-tracking branch 'upstream/master'