Clear Version of BS
Clear Version of BattleShip
Merge remote-tracking branch 'origin/master'

Conflicts:
	BattleShipService/BattleShipClient/Form1.Designer.cs
	BattleShipService/BattleShipClient/Form1.cs
	BattleShipService/BattleShipClient/bin/Debug/BattleShipClient.exe
	BattleShipService/BattleShipClient/bin/Debug/BattleShipClient.pdb
	BattleShipService/BattleShipClient/bin/Debug/BattleShipService.dll
	BattleShipService/BattleShipClient/bin/Debug/BattleShipService.pdb
	BattleShipService/BattleShipClient/obj/Debug/BattleShipClient.csproj.FileListAbsolute.txt
	BattleShipService/BattleShipClient/obj/Debug/BattleShipClient.csproj.GenerateResource.Cache
	BattleShipService/BattleShipClient/obj/Debug/BattleShipClient.csprojResolveAssemblyReference.cache
	BattleShipService/BattleShipClient/obj/Debug/BattleShipClient.exe
	BattleShipService/BattleShipClient/obj/Debug/BattleShipClient.pdb
	BattleShipService/BattleShipClient/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	BattleShipService/BattleShipClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	BattleShipService/BattleShipClient/obj/Debug/TempPE/Service References.ServiceReference1.Reference.cs.dll
	BattleShipService/BattleShipService.v11.suo
	BattleShipService/BattleShipService.v12.suo
	BattleShipService/BattleShipService/bin/Debug/BattleShipService.dll
	BattleShipService/BattleShipService/bin/Debug/BattleShipService.pdb
	BattleShipService/BattleShipService/obj/Debug/BattleShipService.csproj.FileListAbsolute.txt
	BattleShipService/BattleShipService/obj/Debug/BattleShipService.csprojResolveAssemblyReference.cache
	BattleShipService/BattleShipService/obj/Debug/BattleShipService.dll
	BattleShipService/BattleShipService/obj/Debug/BattleShipService.pdb
	BattleShipService/BattleShipService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	BattleShipService/BattleShipService/obj/Debug/WcfConfigValidationData.tmp