bugfix
Merge branch 'master' of https://github.com/yyk/sync3
lots of update of client