调整群消息文字等
Merge remote-tracking branch 'origin/master'