Merge pull request #6 from resJson/master

wanglei for office
Merge pull request #7 from resJson/master

change rademe
Merge pull request #8 from resJson/master

modify chat/FriendsList.java @wanglei
modify join/SignUp.java @yangchen
Merge pull request #9 from resJson/master

modify fans 20140409 14:00@wanglei
Merge pull request #5 from pepoc/master

make