fix server adapter + merged
Merge branch 'master' of https://github.com/tungha/DiamondTest into chordMerge