Here
Merge remote-tracking branch 'origin/master'

Conflicts:
	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.csprojResolveAssemblyReference.cache
	BattleShipService/BattleShipClient/obj/Debug/BattleShipClient.exe
	BattleShipService/BattleShipClient/obj/Debug/BattleShipClient.pdb

	BattleShipService/BattleShipClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	BattleShipService/BattleShipService/bin/Debug/BattleShipService.dll
	BattleShipService/BattleShipService/bin/Debug/BattleShipService.pdb
	BattleShipService/BattleShipService/obj/Debug/BattleShipService.dll
	BattleShipService/BattleShipService/obj/Debug/BattleShipService.pdb

	BattleShipService/BattleShipService/obj/Debug/WcfConfigValidationData.tmp