Merge remote-tracking branch 'origin/QuangBranch' into TingBranch
Updated ClientThread
Merge remote-tracking branch 'origin/TingBranch' into QuangBranch