form changes
local service added
Merge branch 'master' of https://github.com/Apophis3000/WCFChat

Conflicts:
	ChatClient/ChatClient.v12.suo
	ChatClient/ChatClient/App.config
	ChatClient/ChatClient/Chat.csproj
	ChatClient/ChatClient/MainForm.cs
	ChatClient/ChatClient/ServerContent/ServerViewer.cs
	ChatClient/ChatClient/bin/Debug/ChatClient.exe.config
	ChatClient/ChatClient/bin/Debug/ChatClient.vshost.exe.config
	ChatClient/ChatClient/obj/Debug/Chat.csproj.FileListAbsolute.txt
	ChatClient/ChatClient/obj/Debug/Chat.csproj.GenerateResource.Cache
	ChatClient/ChatClient/obj/Debug/Chat.csprojResolveAssemblyReference.cache
	ChatClient/ChatClient/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	ChatClient/ChatClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ChatClient/TestServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of https://github.com/Apophis3000/WCFChat