GeneralView.xaml touched
Minior changes
Merge branch 'master' of https://github.com/BlueForeverI/XamlChat.Client

Conflicts:
	Xaml.Chat.Client/ViewModels/AppViewModel.cs
	Xaml.Chat.Client/ViewModels/GeneralViewModel.cs
	Xaml.Chat.Client/Views/GeneralView.xaml
	Xaml.Chat.Client/Xaml.Chat.Client.v11.suo
	Xaml.Chat.Client/obj/Debug/MainWindow.baml
	Xaml.Chat.Client/obj/Debug/MainWindow.g.cs
	Xaml.Chat.Client/obj/Debug/Xaml.Chat.Client.csproj.FileListAbsolute.txt
	Xaml.Chat.Client/obj/Debug/Xaml.Chat.Client.g.resources
	Xaml.Chat.Client/obj/Debug/Xaml.Chat.Client_MarkupCompile.cache
	Xaml.Chat.Client/obj/Debug/Xaml.Chat.Client_MarkupCompile.i.cache