Merging
Merge branch 'master' of https://github.com/ivan-golub/ImagineCup

Conflicts:
	ImagineCupQuest/ICWebServise/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ImagineCupQuest/ICWindows8/bin/x86/Debug/AppX/ICWindows8.exe
	ImagineCupQuest/ICWindows8/bin/x86/Debug/AppX/ICWindows8.pdb
	ImagineCupQuest/ICWindows8/bin/x86/Debug/AppX/vs.appxrecipe
	ImagineCupQuest/ICWindows8/bin/x86/Debug/ICWindows8.build.appxrecipe
	ImagineCupQuest/ICWindows8/bin/x86/Debug/ICWindows8.exe
	ImagineCupQuest/ICWindows8/bin/x86/Debug/ICWindows8.pdb
	ImagineCupQuest/ICWindows8/obj/x86/Debug/App.g.cs
	ImagineCupQuest/ICWindows8/obj/x86/Debug/App.g.i.cs
	ImagineCupQuest/ICWindows8/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ImagineCupQuest/ICWindows8/obj/x86/Debug/ICWindows8.csproj.FileListAbsolute.txt
	ImagineCupQuest/ICWindows8/obj/x86/Debug/ICWindows8.csproj.GenerateResource.Cache
	ImagineCupQuest/ICWindows8/obj/x86/Debug/ICWindows8.csprojResolveAssemblyReference.cache
	ImagineCupQuest/ICWindows8/obj/x86/Debug/ICWindows8.exe
	ImagineCupQuest/ICWindows8/obj/x86/Debug/ICWindows8.pdb
	ImagineCupQuest/ICWindows8/obj/x86/Debug/MainPage.g.cs
	ImagineCupQuest/ICWindows8/obj/x86/Debug/MainPage.g.i.cs
	ImagineCupQuest/ICWindows8/obj/x86/Debug/ProjectArchitectures.txt
	ImagineCupQuest/ICWindows8/obj/x86/Debug/XamlTypeInfo.g.cs
	ImagineCupQuest/ICWindows8/obj/x86/Debug/intermediatexaml/ICWindows8.exe
	ImagineCupQuest/ICWindows8/obj/x86/Debug/intermediatexaml/ICWindows8.pdb
	ImagineCupQuest/ICWindows8/obj/x86/Debug/pri.resfiles
	ImagineCupQuest/ImagineCupQuest.v11.suo
merge
Merge branch 'master' of https://github.com/ivan-golub/ImagineCup

Conflicts:
	ImagineCupQuest/ICCommonObjects/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ImagineCupQuest/ICCommonObjects/obj/Debug/ICCommonObjects.csproj.FileListAbsolute.txt
	ImagineCupQuest/ICWindows8/bin/x86/Debug/AppX/AppxManifest.xml
	ImagineCupQuest/ICWindows8/bin/x86/Debug/AppX/ICCommonObjects.dll
	ImagineCupQuest/ICWindows8/bin/x86/Debug/AppX/ICWindows8.exe
	ImagineCupQuest/ICWindows8/bin/x86/Debug/AppX/ICWindows8.pdb
	ImagineCupQuest/ICWindows8/bin/x86/Debug/AppX/vs.appxrecipe
	ImagineCupQuest/ICWindows8/bin/x86/Debug/AppxManifest.xml
	ImagineCupQuest/ICWindows8/bin/x86/Debug/ICWindows8.build.appxrecipe
	ImagineCupQuest/ICWindows8/bin/x86/Debug/ICWindows8.exe
	ImagineCupQuest/ICWindows8/bin/x86/Debug/ICWindows8.pdb
	ImagineCupQuest/ICWindows8/obj/x86/Debug/App.g.cs
	ImagineCupQuest/ICWindows8/obj/x86/Debug/App.g.i.cs
	ImagineCupQuest/ICWindows8/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	ImagineCupQuest/ICWindows8/obj/x86/Debug/ICWindows8.csproj.FileListAbsolute.txt
	ImagineCupQuest/ICWindows8/obj/x86/Debug/ICWindows8.csproj.GenerateResource.Cache
	ImagineCupQuest/ICWindows8/obj/x86/Debug/ICWindows8.csprojResolveAssemblyReference.cache
	ImagineCupQuest/ICWindows8/obj/x86/Debug/ICWindows8.exe
	ImagineCupQuest/ICWindows8/obj/x86/Debug/ICWindows8.pdb
	ImagineCupQuest/ICWindows8/obj/x86/Debug/MainPage.g.cs
	ImagineCupQuest/ICWindows8/obj/x86/Debug/MainPage.g.i.cs
	ImagineCupQuest/ICWindows8/obj/x86/Debug/ProjectArchitectures.txt
	ImagineCupQuest/ICWindows8/obj/x86/Debug/intermediatexaml/ICWindows8.exe
	ImagineCupQuest/ICWindows8/obj/x86/Debug/intermediatexaml/ICWindows8.pdb
	ImagineCupQuest/ICWindows8/obj/x86/Debug/pri.resfiles
	ImagineCupQuest/UpgradeLog.XML
	ImagineCupQuest/UpgradeLog.htm
	ImagineCupQuest/_UpgradeReport_Files/UpgradeReport.xslt
Conflicts and build fixes