unknown merge
Merge branch 'develop' of https://github.com/lao605/zzc into develop
minor fixes to existing code
fix addFriend
patch for last commit