添加表情和截图
Merge branch 'master' of https://github.com/lovevrlsq/Client

Conflicts:
	Client.Client.Control/Client.Client.Control.csproj
	Client.Client.Control/class/TalkClientViewModel.cs