eee
Merge branch 'client' of https://github.com/lihaoda/FinalPro.git into client

Conflicts:
	LetSay/src/view/ChatStage.java
Merge branch 'client' of https://github.com/lihaoda/FinalPro into client
fix his calendar