Merge branch 'client'
Merge branch 'master' of https://github.com/lihaoda/FinalPro.git
change to client

pull client again
got some missed

got some missed
back to client

back to client
switch to client

switch to client
Merge branch 'master' of https://github.com/lihaoda/FinalPro

Conflicts:
	LetSay/src/view/ButtonAction.java
	LetSay/src/view/FriendInfoPage.java
	LetSay/src/view/Login.java