play client done
Merge remote-tracking branch 'origin/release' into zhangjc