wip solve collission
Merge branch 'master' of https://github.com/ViGor-Thinktank/GCML

Conflicts:
	GenericCampaignMasterLib/Code/CampaignController.cs
	GenericCampaignMasterModel/Commands/comSolveKollision.cs
	XNA Client/NuclearSample/NuclearSample/GCML DemoClient-windows.csproj.Debug.cachefile
	XNA Client/NuclearSample/NuclearSample/obj/x86/Debug/cachefile-{A32183B7-F5FD-4FD9-8E3B-55791E948330}-targetpath.txt
	XNA Client/NuclearSample/NuclearSampleContent/GCML_XNA_Client.contentproj
	XNA Client/NuclearSample/NuclearSampleContent/obj/x86/Debug/ContentPipeline.xml