message ok~
pull somethings
Merge branch 'client' of https://github.com/lihaoda/FinalPro into client

Conflicts:
	LetSay/src/view/CardChatListPage.java
	LetSay/src/view/ChatRoomPage.java
	LetSay/src/view/FrdRequireBox.java
	LetSay/src/view/FriendInfoPage.java
	LetSay/src/view/HomePage.java
	LetSay/src/view/NewMessageButton.java