conflict between servers debuged, conflicted servers and clients working.
Merge branch 'master' of https://github.com/haijunq/dblike