Fixed toArray()...
Add message types for friend msg
Merge branch 'client' of https://github.com/lihaoda/FinalPro.git into client
Merge branch 'master' into client
merged