Commit to pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	MDW/RiskGame/ClientRiskGame.cs
	MDW/RiskGame/RiskGame.csproj
	MDW/RiskGame/RiskGameForm.cs
	MDW/RiskGame/Service References/RiskServiceReference/Reference.cs
	MDW/RiskGame/Service References/RiskServiceReference/Reference.svcmap
	MDW/RiskGame/Service References/RiskServiceReference/RiskGameClient.RiskServiceReference.Territory.datasource
	MDW/RiskGame/Service References/RiskServiceReference/Service.wsdl
	MDW/RiskGame/Service References/RiskServiceReference/Service.xsd
	MDW/RiskGame/Service References/RiskServiceReference/Service2.xsd
	MDW/RiskGame/Service References/RiskServiceReference/service1.wsdl
	MDW/Service/App.config
	MDW/Service/IRisk.cs
	MDW/Service/RiskService.cs