Caca
Merge branch 'master' of https://github.com/Poutsh/AdvancedTactics

Conflicts:
	Advanced Tactics/Advanced Tactics/bin/x86/Debug/Advanced Tactics.exe
	Advanced Tactics/Advanced Tactics/bin/x86/Debug/Advanced Tactics.pdb
	Advanced Tactics/Advanced Tactics/bin/x86/Debug/Content/Russian Red Army Choir.wma
	Advanced Tactics/Advanced Tactics/obj/x86/Debug/Advanced Tactics.csproj.FileListAbsolute.txt
	Advanced Tactics/Advanced Tactics/obj/x86/Debug/Advanced Tactics.csprojResolveAssemblyReference.cache
	Advanced Tactics/Advanced Tactics/obj/x86/Debug/Advanced Tactics.exe
	Advanced Tactics/Advanced Tactics/obj/x86/Debug/Advanced Tactics.pdb
	Advanced Tactics/Advanced TacticsContent/obj/x86/Debug/ContentPipeline.xml