add some friend info
Merge branch 'client' of https://github.com/lihaoda/FinalPro.git into client
fixed bugs