diff --git a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_Linux.csproj b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_Linux.csproj
index 362392f4..c26a9c40 100644
--- a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_Linux.csproj
+++ b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_Linux.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>TRACE;DEBUG;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,10 +30,12 @@
     <DefineConstants>TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AnxContentImporterContext.cs" />
@@ -57,9 +60,9 @@
     <Compile Include="ContentProcessor.cs" />
     <Compile Include="ContentProcessorAttribute.cs" />
     <Compile Include="ContentProcessorContext.cs" />
-    <Compile Include="EffectImporter.cs" />
+    <Compile Include="Importer\EffectImporter.cs" />
     <Compile Include="ExternalReference.cs" />
-    <Compile Include="FbxImporter.cs" />
+    <Compile Include="Importer\FbxImporter.cs" />
     <Compile Include="Graphics\AnimationChannel.cs" />
     <Compile Include="Graphics\AnimationChannelDictionary.cs" />
     <Compile Include="Graphics\AnimationContent.cs" />
@@ -104,6 +107,8 @@
     <Compile Include="IContentImporter.cs" />
     <Compile Include="IContentProcessor.cs" />
     <Compile Include="Importer\TextureImporter.cs" />
+    <Compile Include="Importer\WavImporter.cs" />
+    <Compile Include="InvalidContentException.cs" />
     <Compile Include="NamedValueDictionary.cs" />
     <Compile Include="OpaqueDataDictionary.cs" />
     <Compile Include="Processors\CompiledEffectContent.cs" />
@@ -157,6 +162,7 @@
     <Compile Include="Serialization\Compiler\MathTypeWriters\RayWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\PointWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\MatrixWriter.cs" />
+    <Compile Include="Serialization\Compiler\MediaTypeWriters\SoundEffectWriter.cs" />
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\ByteWriter.cs" />
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\CharWriter.cs" />
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\BooleanWriter.cs" />
@@ -175,6 +181,7 @@
     <Compile Include="TargetPlatform.cs" />
     <Compile Include="Tasks\BuildContent.cs" />
     <Compile Include="Tasks\BuildItem.cs" />
+    <Compile Include="Tasks\ContentProject.cs" />
     <Compile Include="Tasks\ImporterManager.cs" />
     <Compile Include="Tasks\ProcessorManager.cs" />
     <Compile Include="VideoContent.cs" />
@@ -184,6 +191,14 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
+    <ProjectReference Include="..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_Linux.csproj">
+      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
+      <Name>ANX.RenderSystem.Windows.GL3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Tools\WaveUtils\WaveUtils.csproj">
+      <Project>{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}</Project>
+      <Name>WaveUtils</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj
index e1a83298..e1a1ac65 100644
--- a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj
+++ b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>TRACE;DEBUG;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,10 +30,12 @@
     <DefineConstants>TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
@@ -58,9 +61,9 @@
     <Compile Include="ContentProcessor.cs" />
     <Compile Include="ContentProcessorAttribute.cs" />
     <Compile Include="ContentProcessorContext.cs" />
-    <Compile Include="EffectImporter.cs" />
+    <Compile Include="Importer\EffectImporter.cs" />
     <Compile Include="ExternalReference.cs" />
-    <Compile Include="FbxImporter.cs" />
+    <Compile Include="Importer\FbxImporter.cs" />
     <Compile Include="Graphics\AnimationChannel.cs" />
     <Compile Include="Graphics\AnimationChannelDictionary.cs" />
     <Compile Include="Graphics\AnimationContent.cs" />
@@ -105,6 +108,8 @@
     <Compile Include="IContentImporter.cs" />
     <Compile Include="IContentProcessor.cs" />
     <Compile Include="Importer\TextureImporter.cs" />
+    <Compile Include="Importer\WavImporter.cs" />
+    <Compile Include="InvalidContentException.cs" />
     <Compile Include="NamedValueDictionary.cs" />
     <Compile Include="OpaqueDataDictionary.cs" />
     <Compile Include="Processors\CompiledEffectContent.cs" />
@@ -158,6 +163,7 @@
     <Compile Include="Serialization\Compiler\MathTypeWriters\RayWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\PointWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\MatrixWriter.cs" />
+    <Compile Include="Serialization\Compiler\MediaTypeWriters\SoundEffectWriter.cs" />
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\ByteWriter.cs" />
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\CharWriter.cs" />
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\BooleanWriter.cs" />
@@ -176,6 +182,7 @@
     <Compile Include="TargetPlatform.cs" />
     <Compile Include="Tasks\BuildContent.cs" />
     <Compile Include="Tasks\BuildItem.cs" />
+    <Compile Include="Tasks\ContentProject.cs" />
     <Compile Include="Tasks\ImporterManager.cs" />
     <Compile Include="Tasks\ProcessorManager.cs" />
     <Compile Include="VideoContent.cs" />
@@ -185,6 +192,14 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
+    <ProjectReference Include="..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj">
+      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
+      <Name>ANX.RenderSystem.Windows.GL3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Tools\WaveUtils\WaveUtils.csproj">
+      <Project>{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}</Project>
+      <Name>WaveUtils</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Sce\Sce.Psm.CSharp.targets" />
diff --git a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_WindowsMetro.csproj b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_WindowsMetro.csproj
index 3151a49f..bc9c479e 100644
--- a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_WindowsMetro.csproj
+++ b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_WindowsMetro.csproj
@@ -23,6 +23,7 @@
     <DefineConstants>TRACE;DEBUG;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,9 +32,12 @@
     <DefineConstants>TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AnxContentImporterContext.cs" />
@@ -58,9 +62,9 @@
     <Compile Include="ContentProcessor.cs" />
     <Compile Include="ContentProcessorAttribute.cs" />
     <Compile Include="ContentProcessorContext.cs" />
-    <Compile Include="EffectImporter.cs" />
+    <Compile Include="Importer\EffectImporter.cs" />
     <Compile Include="ExternalReference.cs" />
-    <Compile Include="FbxImporter.cs" />
+    <Compile Include="Importer\FbxImporter.cs" />
     <Compile Include="Graphics\AnimationChannel.cs" />
     <Compile Include="Graphics\AnimationChannelDictionary.cs" />
     <Compile Include="Graphics\AnimationContent.cs" />
@@ -104,6 +108,9 @@
     <Compile Include="Graphics\VertexContent.cs" />
     <Compile Include="IContentImporter.cs" />
     <Compile Include="IContentProcessor.cs" />
+    <Compile Include="Importer\TextureImporter.cs" />
+    <Compile Include="Importer\WavImporter.cs" />
+    <Compile Include="InvalidContentException.cs" />
     <Compile Include="NamedValueDictionary.cs" />
     <Compile Include="OpaqueDataDictionary.cs" />
     <Compile Include="Processors\CompiledEffectContent.cs" />
@@ -144,6 +151,7 @@
     <Compile Include="Serialization\Compiler\GenericContentTypeWriter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\EffectWriter.cs" />
+    <Compile Include="Serialization\Compiler\GraphicTypeWriters\TextureWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\BoundingBoxWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\BoundingSphereWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\BoundingFrustumWriter.cs" />
@@ -156,6 +164,7 @@
     <Compile Include="Serialization\Compiler\MathTypeWriters\RayWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\PointWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\MatrixWriter.cs" />
+    <Compile Include="Serialization\Compiler\MediaTypeWriters\SoundEffectWriter.cs" />
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\ByteWriter.cs" />
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\CharWriter.cs" />
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\BooleanWriter.cs" />
@@ -174,7 +183,7 @@
     <Compile Include="TargetPlatform.cs" />
     <Compile Include="Tasks\BuildContent.cs" />
     <Compile Include="Tasks\BuildItem.cs" />
-    <Compile Include="Tasks\BuildRequest.cs" />
+    <Compile Include="Tasks\ContentProject.cs" />
     <Compile Include="Tasks\ImporterManager.cs" />
     <Compile Include="Tasks\ProcessorManager.cs" />
     <Compile Include="VideoContent.cs" />
@@ -184,6 +193,10 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Tools\WaveUtils\WaveUtils.csproj">
+      <Project>{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}</Project>
+      <Name>WaveUtils</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/ANX.Framework/ANX.Framework_WindowsMetro.csproj b/ANX.Framework/ANX.Framework_WindowsMetro.csproj
index fcca4bf4..c1d9c1d6 100644
--- a/ANX.Framework/ANX.Framework_WindowsMetro.csproj
+++ b/ANX.Framework/ANX.Framework_WindowsMetro.csproj
@@ -101,6 +101,7 @@
     <Compile Include="Content\MathTypeReaders\RectangleReader.cs" />
     <Compile Include="Content\MathTypeReaders\Vector2Reader.cs" />
     <Compile Include="Content\MathTypeReaders\Vector3Reader.cs" />
+    <Compile Include="Content\MediaTypeReaders\SoundEffectReader.cs" />
     <Compile Include="Content\PrimitiveTypeReaders\BooleanReader.cs" />
     <Compile Include="Content\PrimitiveTypeReaders\ByteReader.cs" />
     <Compile Include="Content\PrimitiveTypeReaders\CharReader.cs" />
@@ -416,6 +417,7 @@
     <Compile Include="NonXNA\AddInLoadingException.cs" />
     <Compile Include="NonXNA\AddInTypeCollection.cs" />
     <Compile Include="NonXNA\AddInType.cs" />
+    <Compile Include="NonXNA\Development\DeveloperAttribute.cs" />
     <Compile Include="NonXNA\Development\TestStateAttribute.cs" />
     <Compile Include="NonXNA\Development\PercentageCompleteAttribute.cs" />
     <Compile Include="NonXNA\EffectSourceLanguage.cs" />
@@ -505,9 +507,6 @@
     <Compile Include="Vector3.cs" />
     <Compile Include="Vector4.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Content\MediaTypeReaders\" />
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ANX.Framework/Game.cs b/ANX.Framework/Game.cs
index f092d48f..713cc4bb 100644
--- a/ANX.Framework/Game.cs
+++ b/ANX.Framework/Game.cs
@@ -59,7 +59,6 @@ namespace ANX.Framework
 
 			try
 			{
-				Logger.Info("initializing AddInSystemFactory");
 				AddInSystemFactory.Instance.Initialize();
 			}
 			catch (Exception ex)
diff --git a/ANX.Framework/GameHost.cs b/ANX.Framework/GameHost.cs
index f82e1356..f762e8bc 100644
--- a/ANX.Framework/GameHost.cs
+++ b/ANX.Framework/GameHost.cs
@@ -1,9 +1,5 @@
-#region Using Statements
 using System;
 
-
-#endregion // Using Statements
-
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
 // For details see: http://anxframework.codeplex.com/license
diff --git a/ANX.Framework/NonXNA/AddIn.cs b/ANX.Framework/NonXNA/AddIn.cs
index ed3d1fb7..86392d20 100644
--- a/ANX.Framework/NonXNA/AddIn.cs
+++ b/ANX.Framework/NonXNA/AddIn.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reflection;
+using ANX.Framework.NonXNA.Reflection;
 
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
@@ -100,7 +101,7 @@ namespace ANX.Framework.NonXNA
 		#region Constructor
 		public AddIn(Type creatorType, Type supportedPlatformsType)
 		{
-			this.assembly = creatorType.Assembly;
+			this.assembly = TypeHelper.GetAssemblyFrom(creatorType);
 			this.creatorType = creatorType;
 			Type = AddInSystemFactory.GetAddInType(creatorType);
 			this.supportedPlatforms = (ISupportedPlatforms)Activator.CreateInstance(supportedPlatformsType);
diff --git a/ANX.Framework/NonXNA/AddInSystemFactory.cs b/ANX.Framework/NonXNA/AddInSystemFactory.cs
index 050d8b90..09bed535 100644
--- a/ANX.Framework/NonXNA/AddInSystemFactory.cs
+++ b/ANX.Framework/NonXNA/AddInSystemFactory.cs
@@ -61,8 +61,6 @@ namespace ANX.Framework.NonXNA
 
 			foreach (AddInType type in Enum.GetValues(typeof(AddInType)))
 				addinSystems.Add(type, new AddInTypeCollection());
-
-			Logger.Info("Operating System: {0} ({1})", OSInformation.GetVersionString(), OSInformation.GetVersion().ToString());
 		}
 		#endregion
 
@@ -92,10 +90,10 @@ namespace ANX.Framework.NonXNA
 				if (addin.IsValid && addin.IsSupported)
 				{
 				    addinSystems[addin.Type].Add(addin);
-				    Logger.Info("[ANX] successfully loaded addin...");
+					Logger.Info("[ANX] successfully loaded addin " + addin.Name + ".");
 				}
 				else
-				    Logger.Info("[ANX] skipped loading file because it is not supported or not a valid AddIn");
+				    Logger.Info("[ANX] skipped loading file because it is not supported or not a valid AddIn.");
 			}
 		}
 		#endregion
@@ -115,7 +113,7 @@ namespace ANX.Framework.NonXNA
 		private Type FindSupportedPlatformsTypeByAssembly(Type creatorType)
 		{
 			foreach (Type spType in AssemblyLoader.SupportedPlatformsTypes)
-				if (spType.Assembly == creatorType.Assembly)
+				if (TypeHelper.GetAssemblyFrom(spType) == TypeHelper.GetAssemblyFrom(creatorType))
 					return spType;
 
 			return null;
diff --git a/ANX.Framework/NonXNA/Logger.cs b/ANX.Framework/NonXNA/Logger.cs
index 5548d402..73775793 100644
--- a/ANX.Framework/NonXNA/Logger.cs
+++ b/ANX.Framework/NonXNA/Logger.cs
@@ -48,13 +48,13 @@ namespace ANX.Framework.NonXNA
 			IsWritingToConsole = true;
 
 #if !WINDOWSMETRO
-			outputStream = File.Open(Filename, FileMode.Create,
-				FileAccess.Write, FileShare.ReadWrite);
+			outputStream = File.Open(Filename, FileMode.Create, FileAccess.Write, FileShare.ReadWrite);
 			writer = new StreamWriter(outputStream);
 			writer.AutoFlush = true;
 #endif
 
-            WriteToFile("OS: " + OSInformation.GetName() + " - " + OSInformation.GetVersion());
+			WriteToFile("OS: " + OSInformation.GetName() + " - " + OSInformation.GetVersionString() + "(" +
+				OSInformation.GetVersion() + ")");
 			WriteToFile("StartTime: " + CurrentDateTimeStamp);
 			WriteToFile("----------");
 		}
diff --git a/ANX.Framework/NonXNA/ManifestHelper.cs b/ANX.Framework/NonXNA/ManifestHelper.cs
index bbc82dc3..192c88c2 100644
--- a/ANX.Framework/NonXNA/ManifestHelper.cs
+++ b/ANX.Framework/NonXNA/ManifestHelper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using ANX.Framework.NonXNA.Reflection;
 
 namespace ANX.Framework.NonXNA
 {
@@ -7,12 +8,7 @@ namespace ANX.Framework.NonXNA
 	{
 		public static Stream GetManifestResourceStream(Game game, string name)
 		{
-			Type gameType = game.GetType();
-#if WINDOWSMETRO
-			return gameType.GetTypeInfo().Assembly.GetManifestResourceStream(name);
-#else
-			return gameType.Assembly.GetManifestResourceStream(name);
-#endif
+			return TypeHelper.GetAssemblyFrom(game.GetType()).GetManifestResourceStream(name);
 		}
 	}
 }
diff --git a/ANX.Framework/NonXNA/Reflection/AssemblyLoader.cs b/ANX.Framework/NonXNA/Reflection/AssemblyLoader.cs
index 553957c5..8a593ce9 100644
--- a/ANX.Framework/NonXNA/Reflection/AssemblyLoader.cs
+++ b/ANX.Framework/NonXNA/Reflection/AssemblyLoader.cs
@@ -44,8 +44,10 @@ namespace ANX.Framework.NonXNA.Reflection
 			LoadAssembliesFromFile();
 			LoadAssembliesFromNames();
 
+#if !WINDOWSMETRO // TODO: find way for metro
 			// Also load the current assembly. This is needed when we run on android or win8 with merged assemblies.
 			allAssemblies.Add(Assembly.GetEntryAssembly());
+#endif
 		}
 		#endregion
 
@@ -99,9 +101,6 @@ namespace ANX.Framework.NonXNA.Reflection
 			allAssemblyNames.Add("ANX.InputSystem.Standard");
 			allAssemblyNames.Add("ANX.InputDevices.Windows.XInput");
 			allAssemblyNames.Add("ANX.SoundSystem.Windows.XAudio");
-
-			// TODO: replace with metro media system
-			allAssemblyNames.Add("ANX.MediaSystem.Windows.OpenAL");
 #endif
 
 			foreach (string assemblyName in allAssemblyNames)
diff --git a/ANX.Framework/NonXNA/Reflection/TypeHelper.cs b/ANX.Framework/NonXNA/Reflection/TypeHelper.cs
index 790a2178..9bb1b1fc 100644
--- a/ANX.Framework/NonXNA/Reflection/TypeHelper.cs
+++ b/ANX.Framework/NonXNA/Reflection/TypeHelper.cs
@@ -115,6 +115,17 @@ namespace ANX.Framework.NonXNA.Reflection
 		}
 		#endregion
 
+		#region GetAssemblyFrom
+		public static Assembly GetAssemblyFrom(Type type)
+		{
+#if WINDOWSMETRO
+			return type.GetTypeInfo().Assembly;
+#else
+			return type.Assembly;
+#endif
+		}
+		#endregion
+
 		#region IsValueType
 		public static bool IsValueType(Type type)
 		{
diff --git a/ANX.Framework_Linux.sln b/ANX.Framework_Linux.sln
index 1b39dfe9..ff93379e 100644
--- a/ANX.Framework_Linux.sln
+++ b/ANX.Framework_Linux.sln
@@ -177,6 +177,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.PsVita", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.PsVita", "SoundSystems\ANX.SoundSystem.PsVita\ANX.SoundSystem.PsVita_Linux.csproj", "{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AudioSample", "Samples\AudioSample\AudioSample_Linux.csproj", "{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaveUtils", "Tools\WaveUtils\WaveUtils.csproj", "{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.ContentCompiler.GUI", "Tools\ANXContentCompilerGUI\ANX.ContentCompiler.GUI.csproj", "{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -677,6 +683,37 @@ Global
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|x86.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Any CPU.Build.0 = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|x86.ActiveCfg = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|x86.Build.0 = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Any CPU.ActiveCfg = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mixed Platforms.Build.0 = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x86.ActiveCfg = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x86.Build.0 = Release|x86
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|x86.ActiveCfg = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -691,6 +728,8 @@ Global
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
 		{14B39F89-C9B0-407E-877A-B515C985E96E} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
 		{5BE49183-2F6F-4527-AC90-D816911FCF90} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
@@ -711,6 +750,7 @@ Global
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
 		{160150D5-38E6-482D-97F5-2624F322A854} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{49066074-3B7B-4A55-B122-6BD33AB73558} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{60D08399-244F-46A3-91F1-4CFD26D961A3} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
diff --git a/ANX.Framework_PSVita.sln b/ANX.Framework_PSVita.sln
index cd24ce4a..47f32da3 100644
--- a/ANX.Framework_PSVita.sln
+++ b/ANX.Framework_PSVita.sln
@@ -177,6 +177,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.PsVita", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.PsVita", "SoundSystems\ANX.SoundSystem.PsVita\ANX.SoundSystem.PsVita_PSVita.csproj", "{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AudioSample", "Samples\AudioSample\AudioSample_PSVita.csproj", "{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaveUtils", "Tools\WaveUtils\WaveUtils.csproj", "{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.ContentCompiler.GUI", "Tools\ANXContentCompilerGUI\ANX.ContentCompiler.GUI.csproj", "{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -677,6 +683,37 @@ Global
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|x86.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Any CPU.Build.0 = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|x86.ActiveCfg = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|x86.Build.0 = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Any CPU.ActiveCfg = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mixed Platforms.Build.0 = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x86.ActiveCfg = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x86.Build.0 = Release|x86
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|x86.ActiveCfg = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -691,6 +728,8 @@ Global
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
 		{14B39F89-C9B0-407E-877A-B515C985E96E} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
 		{5BE49183-2F6F-4527-AC90-D816911FCF90} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
@@ -711,6 +750,7 @@ Global
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
 		{160150D5-38E6-482D-97F5-2624F322A854} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{49066074-3B7B-4A55-B122-6BD33AB73558} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{60D08399-244F-46A3-91F1-4CFD26D961A3} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
diff --git a/ANX.Framework_WindowsMetro.sln b/ANX.Framework_WindowsMetro.sln
index f1ed0470..9025fa3a 100644
--- a/ANX.Framework_WindowsMetro.sln
+++ b/ANX.Framework_WindowsMetro.sln
@@ -1,10 +1,10 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework_WindowsMetro", "ANX.Framework\ANX.Framework_WindowsMetro.csproj", "{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework", "ANX.Framework\ANX.Framework_WindowsMetro.csproj", "{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.TestCenter_WindowsMetro", "ANX.Framework.TestCenter\ANX.Framework.TestCenter_WindowsMetro.csproj", "{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.TestCenter", "ANX.Framework.TestCenter\ANX.Framework.TestCenter_WindowsMetro.csproj", "{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.ContentPipeline.Extensions_WindowsMetro", "ANX.Framework.ContentPipeline\ANX.Framework.ContentPipeline.Extensions_WindowsMetro.csproj", "{ECBF60CB-1CF0-4F92-8963-E73115B04B43}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.ContentPipeline.Extensions", "ANX.Framework.ContentPipeline\ANX.Framework.ContentPipeline.Extensions_WindowsMetro.csproj", "{ECBF60CB-1CF0-4F92-8963-E73115B04B43}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{B24A8593-562A-4A25-BB08-46C163F10F3F}"
 EndProject
@@ -17,11 +17,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{9B0D
 		Samples\SampleCatalog.xml = Samples\SampleCatalog.xml
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VertexIndexBuffer_WindowsMetro", "Samples\VertexIndexBuffer\VertexIndexBuffer_WindowsMetro.csproj", "{F945515B-394D-4ED4-80E0-98EB59B69D24}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VertexIndexBuffer", "Samples\VertexIndexBuffer\VertexIndexBuffer_WindowsMetro.csproj", "{F945515B-394D-4ED4-80E0-98EB59B69D24}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleSprite_WindowsMetro", "Samples\SimpleSprite\SimpleSprite_WindowsMetro.csproj", "{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleSprite", "Samples\SimpleSprite\SimpleSprite_WindowsMetro.csproj", "{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextRendering_WindowsMetro", "Samples\TextRendering\TextRendering_WindowsMetro.csproj", "{BC79B021-10E4-4D01-945A-7048FFF53A22}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextRendering", "Samples\TextRendering\TextRendering_WindowsMetro.csproj", "{BC79B021-10E4-4D01-945A-7048FFF53A22}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleContent", "Samples\SampleContent\SampleContent.contentproj", "{FA6E229D-4504-47B1-8A23-2D3FCC13F778}"
 EndProject
@@ -29,13 +29,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InputSystems", "InputSystem
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SoundSystems", "SoundSystems", "{5725DA44-4F5C-4E93-A957-AC5C85603EE9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.Windows.XAudio_WindowsMetro", "SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj", "{6A582788-C4D2-410C-96CD-177F75712D65}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.Windows.XAudio", "SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj", "{6A582788-C4D2-410C-96CD-177F75712D65}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsGame_WindowsMetro", "Samples\WindowsGame\WindowsGame_WindowsMetro.csproj", "{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsGame", "Samples\WindowsGame\WindowsGame_WindowsMetro.csproj", "{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectConverter", "Tools\ProjectConverter\ProjectConverter.csproj", "{B5209A04-B2F8-4033-A5E7-545BE771214C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kinect_WindowsMetro", "Samples\Kinect\Kinect_WindowsMetro.csproj", "{A42413A9-5189-40CB-AACA-D50F24865431}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kinect", "Samples\Kinect\Kinect_WindowsMetro.csproj", "{A42413A9-5189-40CB-AACA-D50F24865431}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stock Shaders", "Stock Shaders", "{60824BDB-AC8A-42ED-9B79-111FB44669FF}"
 EndProject
@@ -78,11 +78,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XNA", "XNA", "{BD648BB8-EF2
 		shader\XNA\Structures.fxh = shader\XNA\Structures.fxh
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.DX10_WindowsMetro", "RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_WindowsMetro.csproj", "{5BE49183-2F6F-4527-AC90-D816911FCF90}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.DX10", "RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_WindowsMetro.csproj", "{5BE49183-2F6F-4527-AC90-D816911FCF90}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.GL3_WindowsMetro", "RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_WindowsMetro.csproj", "{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.GL3", "RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_WindowsMetro.csproj", "{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.DX11_WindowsMetro", "RenderSystems\ANX.RenderSystem.Windows.DX11\ANX.RenderSystem.Windows.DX11_WindowsMetro.csproj", "{B30DE9C2-0926-46B6-8351-9AF276C472D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.DX11", "RenderSystems\ANX.RenderSystem.Windows.DX11\ANX.RenderSystem.Windows.DX11_WindowsMetro.csproj", "{B30DE9C2-0926-46B6-8351-9AF276C472D5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{82CDEC51-2E62-4D6D-8A89-8E0F68A9722B}"
 	ProjectSection(SolutionItems) = preProject
@@ -91,24 +91,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{82CDEC51
 		build\MakeAnxFramework.cmd = build\MakeAnxFramework.cmd
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyboardSample_WindowsMetro", "Samples\KeyboardSample\KeyboardSample_WindowsMetro.csproj", "{05233BB1-444F-43F6-A3DF-B82AA924E094}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyboardSample", "Samples\KeyboardSample\KeyboardSample_WindowsMetro.csproj", "{05233BB1-444F-43F6-A3DF-B82AA924E094}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{04C721BB-F871-4872-9EA9-B2062BF21E62}"
 	ProjectSection(SolutionItems) = preProject
 		Installer\anx.wxs = Installer\anx.wxs
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenderTarget_WindowsMetro", "Samples\RenderTarget\RenderTarget_WindowsMetro.csproj", "{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenderTarget", "Samples\RenderTarget\RenderTarget_WindowsMetro.csproj", "{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StencilBuffer_WindowsMetro", "Samples\StencilBuffer\StencilBuffer_WindowsMetro.csproj", "{41E6C2CF-51EA-4D8E-96AE-739CA3951766}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StencilBuffer", "Samples\StencilBuffer\StencilBuffer_WindowsMetro.csproj", "{41E6C2CF-51EA-4D8E-96AE-739CA3951766}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primitives_WindowsMetro", "Samples\Primitives\Primitives_WindowsMetro.csproj", "{57097B7A-A283-4409-8AAC-35BF0F458657}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primitives", "Samples\Primitives\Primitives_WindowsMetro.csproj", "{57097B7A-A283-4409-8AAC-35BF0F458657}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.OpenAL_WindowsMetro", "SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL_WindowsMetro.csproj", "{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.OpenAL", "SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL_WindowsMetro.csproj", "{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.Recording_WindowsMetro", "InputSystems\ANX.InputSystem.Recording\ANX.InputSystem.Recording_WindowsMetro.csproj", "{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.Recording", "InputSystems\ANX.InputSystem.Recording\ANX.InputSystem.Recording_WindowsMetro.csproj", "{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.Metro_WindowsMetro", "RenderSystems\ANX.RenderSystem.Windows.Metro\ANX.RenderSystem.Windows.Metro_WindowsMetro.csproj", "{FF0AB665-2796-4354-9630-76C2751DB3C2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.Metro", "RenderSystems\ANX.RenderSystem.Windows.Metro\ANX.RenderSystem.Windows.Metro_WindowsMetro.csproj", "{FF0AB665-2796-4354-9630-76C2751DB3C2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DX11", "DX11", "{6285F3EF-07DB-49C9-8CDE-A9092789FE4F}"
 	ProjectSection(SolutionItems) = preProject
@@ -121,43 +121,39 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DX11", "DX11", "{6285F3EF-0
 		shader\DX11\SpriteBatch.fx = shader\DX11\SpriteBatch.fx
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.Standard_WindowsMetro", "InputSystems\ANX.InputSystem.Standard\ANX.InputSystem.Standard_WindowsMetro.csproj", "{49066074-3B7B-4A55-B122-6BD33AB73558}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.Standard", "InputSystems\ANX.InputSystem.Standard\ANX.InputSystem.Standard_WindowsMetro.csproj", "{49066074-3B7B-4A55-B122-6BD33AB73558}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.XInput_WindowsMetro", "InputSystems\ANX.InputDevices.Windows.XInput\ANX.InputDevices.Windows.XInput_WindowsMetro.csproj", "{60D08399-244F-46A3-91F1-4CFD26D961A3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.XInput", "InputSystems\ANX.InputDevices.Windows.XInput\ANX.InputDevices.Windows.XInput_WindowsMetro.csproj", "{60D08399-244F-46A3-91F1-4CFD26D961A3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.OpenTK_WindowsMetro", "InputSystems\ANX.InputDevices.OpenTK\ANX.InputDevices.OpenTK_WindowsMetro.csproj", "{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.OpenTK", "InputSystems\ANX.InputDevices.OpenTK\ANX.InputDevices.OpenTK_WindowsMetro.csproj", "{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.Kinect_WindowsMetro", "InputSystems\ANX.InputDevices.Windows.Kinect\ANX.InputDevices.Windows.Kinect_WindowsMetro.csproj", "{E5D69E75-D77C-493F-BBDA-6F9E73B82549}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.Kinect", "InputSystems\ANX.InputDevices.Windows.Kinect\ANX.InputDevices.Windows.Kinect_WindowsMetro.csproj", "{E5D69E75-D77C-493F-BBDA-6F9E73B82549}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Test_WindowsMetro", "InputSystems\ANX.InputDevices.Test\ANX.InputDevices.Test_WindowsMetro.csproj", "{5040A9C7-6DEC-4613-8586-A598C4070B35}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Test", "InputSystems\ANX.InputDevices.Test\ANX.InputDevices.Test_WindowsMetro.csproj", "{5040A9C7-6DEC-4613-8586-A598C4070B35}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiRenderTarget_WindowsMetro", "Samples\MultiRenderTarget\MultiRenderTarget_WindowsMetro.csproj", "{9C9C6245-35C2-4230-8E17-9038A228227F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MediaSystems", "MediaSystems", "{6EDED295-0F32-4D05-A8EA-02F4BF89CF35}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.MediaSystem.Windows.OpenAL", "MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj", "{97185A92-077D-4498-8B6A-8BFF04079044}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiRenderTarget", "Samples\MultiRenderTarget\MultiRenderTarget_WindowsMetro.csproj", "{9C9C6245-35C2-4230-8E17-9038A228227F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlatformSystems", "PlatformSystems", "{1436F7C9-29D3-4FEF-8914-10B45F13D142}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsEditor_WindowsMetro", "Samples\WindowsFormsEditor\WindowsFormsEditor_WindowsMetro.csproj", "{441D953C-94C2-42FD-9917-3EB2F6E28173}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsEditor", "Samples\WindowsFormsEditor\WindowsFormsEditor_WindowsMetro.csproj", "{441D953C-94C2-42FD-9917-3EB2F6E28173}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfEditor_WindowsMetro", "Samples\WpfEditor\WpfEditor_WindowsMetro.csproj", "{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfEditor", "Samples\WpfEditor\WpfEditor_WindowsMetro.csproj", "{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelSample_WindowsMetro", "Samples\ModelSample\ModelSample\ModelSample_WindowsMetro.csproj", "{ED081799-AB02-4793-96F8-F9EA7F3192E3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelSample", "Samples\ModelSample\ModelSample\ModelSample_WindowsMetro.csproj", "{ED081799-AB02-4793-96F8-F9EA7F3192E3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.Windows_WindowsMetro", "PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows_WindowsMetro.csproj", "{068EB2E9-963C-4E1B-8831-E25011F11FFE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.Windows", "PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows_WindowsMetro.csproj", "{068EB2E9-963C-4E1B-8831-E25011F11FFE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.Metro_WindowsMetro", "PlatformSystems\ANX.PlatformSystem.Metro\ANX.PlatformSystem.Metro_WindowsMetro.csproj", "{04F6041E-475E-4B2A-A889-6A33EABD718B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.Metro", "PlatformSystems\ANX.PlatformSystem.Metro\ANX.PlatformSystem.Metro_WindowsMetro.csproj", "{04F6041E-475E-4B2A-A889-6A33EABD718B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.Linux_WindowsMetro", "PlatformSystems\ANX.PlatformSystem.Linux\ANX.PlatformSystem.Linux_WindowsMetro.csproj", "{2B6D0EFF-7874-495F-9226-873ED9649C60}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.Linux", "PlatformSystems\ANX.PlatformSystem.Linux\ANX.PlatformSystem.Linux_WindowsMetro.csproj", "{2B6D0EFF-7874-495F-9226-873ED9649C60}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecordingSample_WindowsMetro", "Samples\RecordingSample\RecordingSample_WindowsMetro.csproj", "{160150D5-38E6-482D-97F5-2624F322A854}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecordingSample", "Samples\RecordingSample\RecordingSample_WindowsMetro.csproj", "{160150D5-38E6-482D-97F5-2624F322A854}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.PsVita_WindowsMetro", "RenderSystems\ANX.RenderSystem.PsVita\ANX.RenderSystem.PsVita_WindowsMetro.csproj", "{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.PsVita", "RenderSystems\ANX.RenderSystem.PsVita\ANX.RenderSystem.PsVita_WindowsMetro.csproj", "{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.PsVita_WindowsMetro", "PlatformSystems\ANX.PlatformSystem.PsVita\ANX.PlatformSystem.PsVita_WindowsMetro.csproj", "{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.PsVita", "PlatformSystems\ANX.PlatformSystem.PsVita\ANX.PlatformSystem.PsVita_WindowsMetro.csproj", "{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.Content.Pipeline_WindowsMetro", "ANX.Framework.Content.Pipeline\ANX.Framework.Content.Pipeline_WindowsMetro.csproj", "{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.Content.Pipeline", "ANX.Framework.Content.Pipeline\ANX.Framework.Content.Pipeline_WindowsMetro.csproj", "{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HLSLParser", "Tools\HLSLParser\HLSLParser\HLSLParser.csproj", "{9588B0C3-E03A-4C71-89A4-2C8685D426F1}"
 EndProject
@@ -177,722 +173,547 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnxSampleBrowser", "Tools\A
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XNBInspector", "Tools\XNBInspector\XNBInspector.csproj", "{14B39F89-C9B0-407E-877A-B515C985E96E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.PsVita_WindowsMetro", "InputSystems\ANX.InputDevices.PsVita\ANX.InputDevices.PsVita_WindowsMetro.csproj", "{566293A4-1187-4289-A28C-C74B499D46AA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.PsVita", "InputSystems\ANX.InputDevices.PsVita\ANX.InputDevices.PsVita_WindowsMetro.csproj", "{566293A4-1187-4289-A28C-C74B499D46AA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InpuDevices.Windows.ModernUI", "ANX.InpuDevices.Windows.ModernUI\ANX.InpuDevices.Windows.ModernUI.csproj", "{F5819204-4882-4F33-B973-DE6762C9682F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.PsVita", "SoundSystems\ANX.SoundSystem.PsVita\ANX.SoundSystem.PsVita_WindowsMetro.csproj", "{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AudioSample", "Samples\AudioSample\AudioSample_WindowsMetro.csproj", "{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaveUtils", "Tools\WaveUtils\WaveUtils.csproj", "{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.ContentCompiler.GUI", "Tools\ANXContentCompilerGUI\ANX.ContentCompiler.GUI.csproj", "{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
 		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
 		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|ARM.ActiveCfg = Release|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|x64.ActiveCfg = Release|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|x86.ActiveCfg = Release|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|ARM.ActiveCfg = Release|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|x64.ActiveCfg = Release|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|x86.ActiveCfg = Release|Any CPU
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|Any CPU.Build.0 = Debug|x86
-		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|ARM.ActiveCfg = Debug|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|x64.ActiveCfg = Debug|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|x86.ActiveCfg = Debug|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|x86.Build.0 = Debug|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|Any CPU.ActiveCfg = Release|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|Any CPU.Build.0 = Release|x86
-		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|ARM.ActiveCfg = Release|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|Mixed Platforms.Build.0 = Release|x86
-		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|x64.ActiveCfg = Release|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|x86.ActiveCfg = Release|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|x86.Build.0 = Release|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|Any CPU.Build.0 = Debug|x86
-		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|ARM.ActiveCfg = Debug|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|x64.ActiveCfg = Debug|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|x86.ActiveCfg = Debug|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|x86.Build.0 = Debug|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|Any CPU.ActiveCfg = Release|x86
-		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|ARM.ActiveCfg = Release|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|Mixed Platforms.Build.0 = Release|x86
-		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|x64.ActiveCfg = Release|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|x86.ActiveCfg = Release|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|x86.Build.0 = Release|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|Any CPU.Build.0 = Debug|x86
-		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|ARM.ActiveCfg = Debug|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|x64.ActiveCfg = Debug|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|x86.ActiveCfg = Debug|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|x86.Build.0 = Debug|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|Any CPU.ActiveCfg = Release|x86
-		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|ARM.ActiveCfg = Release|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|Mixed Platforms.Build.0 = Release|x86
-		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|x64.ActiveCfg = Release|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|x86.ActiveCfg = Release|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|x86.Build.0 = Release|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|Any CPU.Build.0 = Debug|x86
-		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|ARM.ActiveCfg = Debug|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|x64.ActiveCfg = Debug|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|x86.ActiveCfg = Debug|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|x86.Build.0 = Debug|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|Any CPU.ActiveCfg = Release|x86
-		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|ARM.ActiveCfg = Release|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|Mixed Platforms.Build.0 = Release|x86
-		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|x64.ActiveCfg = Release|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|x86.ActiveCfg = Release|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|x86.Build.0 = Release|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Any CPU.Build.0 = Debug|x86
-		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|ARM.ActiveCfg = Debug|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|x64.ActiveCfg = Debug|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|x86.ActiveCfg = Debug|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|x86.Build.0 = Debug|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Any CPU.ActiveCfg = Release|x86
-		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|ARM.ActiveCfg = Release|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Mixed Platforms.Build.0 = Release|x86
-		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|x64.ActiveCfg = Release|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|x86.ActiveCfg = Release|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|x86.Build.0 = Release|x86
 		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|ARM.ActiveCfg = Debug|Any CPU
 		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|x64.ActiveCfg = Debug|Any CPU
 		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|x86.ActiveCfg = Debug|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|ARM.ActiveCfg = Release|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|x64.ActiveCfg = Release|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|x86.ActiveCfg = Release|Any CPU
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|Any CPU.Build.0 = Debug|x86
-		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|ARM.ActiveCfg = Debug|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|x64.ActiveCfg = Debug|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|x86.ActiveCfg = Debug|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|x86.Build.0 = Debug|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|Any CPU.ActiveCfg = Release|x86
-		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|ARM.ActiveCfg = Release|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|Mixed Platforms.Build.0 = Release|x86
-		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|x64.ActiveCfg = Release|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|x86.ActiveCfg = Release|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|x86.Build.0 = Release|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|Any CPU.Build.0 = Debug|x86
-		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|ARM.ActiveCfg = Debug|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|x64.ActiveCfg = Debug|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|x86.ActiveCfg = Debug|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|x86.Build.0 = Debug|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|Any CPU.ActiveCfg = Release|x86
-		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|ARM.ActiveCfg = Release|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|Mixed Platforms.Build.0 = Release|x86
-		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|x64.ActiveCfg = Release|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|x86.ActiveCfg = Release|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|x86.Build.0 = Release|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|Any CPU.Build.0 = Debug|x86
-		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|ARM.ActiveCfg = Debug|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|x64.ActiveCfg = Debug|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|x86.ActiveCfg = Debug|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|x86.Build.0 = Debug|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|Any CPU.ActiveCfg = Release|x86
-		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|ARM.ActiveCfg = Release|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|Mixed Platforms.Build.0 = Release|x86
-		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|x64.ActiveCfg = Release|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|x86.ActiveCfg = Release|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|x86.Build.0 = Release|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|Any CPU.Build.0 = Debug|x86
-		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|ARM.ActiveCfg = Debug|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|x64.ActiveCfg = Debug|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|x86.ActiveCfg = Debug|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|x86.Build.0 = Debug|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|Any CPU.ActiveCfg = Release|x86
-		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|ARM.ActiveCfg = Release|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|Mixed Platforms.Build.0 = Release|x86
-		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x64.ActiveCfg = Release|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x86.ActiveCfg = Release|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x86.Build.0 = Release|x86
 		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|ARM.ActiveCfg = Release|Any CPU
 		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|x64.ActiveCfg = Release|Any CPU
 		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|x86.ActiveCfg = Release|Any CPU
 		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|ARM.ActiveCfg = Release|Any CPU
 		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|x64.ActiveCfg = Release|Any CPU
 		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|x86.ActiveCfg = Release|Any CPU
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|Any CPU.Build.0 = Debug|x86
-		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|ARM.ActiveCfg = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|x64.ActiveCfg = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|x86.ActiveCfg = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|x86.Build.0 = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|Any CPU.ActiveCfg = Release|x86
-		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|ARM.ActiveCfg = Release|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|Mixed Platforms.Build.0 = Release|x86
-		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|x64.ActiveCfg = Release|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|x86.ActiveCfg = Release|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|x86.Build.0 = Release|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|Any CPU.Build.0 = Debug|x86
-		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|ARM.ActiveCfg = Debug|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|x64.ActiveCfg = Debug|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|x86.ActiveCfg = Debug|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|x86.Build.0 = Debug|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|Any CPU.ActiveCfg = Release|x86
-		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|ARM.ActiveCfg = Release|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|Mixed Platforms.Build.0 = Release|x86
-		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|x64.ActiveCfg = Release|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|x86.ActiveCfg = Release|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|x86.Build.0 = Release|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|Any CPU.Build.0 = Debug|x86
-		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|ARM.ActiveCfg = Debug|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|x64.ActiveCfg = Debug|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|x86.ActiveCfg = Debug|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|x86.Build.0 = Debug|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|Any CPU.ActiveCfg = Release|x86
-		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|ARM.ActiveCfg = Release|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|Mixed Platforms.Build.0 = Release|x86
-		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|x64.ActiveCfg = Release|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|x86.ActiveCfg = Release|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|x86.Build.0 = Release|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|Any CPU.Build.0 = Debug|x86
-		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|ARM.ActiveCfg = Debug|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|x64.ActiveCfg = Debug|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|x86.ActiveCfg = Debug|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|x86.Build.0 = Debug|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|Any CPU.ActiveCfg = Release|x86
-		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|ARM.ActiveCfg = Release|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|Mixed Platforms.Build.0 = Release|x86
-		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|x64.ActiveCfg = Release|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|x86.ActiveCfg = Release|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|x86.Build.0 = Release|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|Any CPU.Build.0 = Debug|x86
-		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|ARM.ActiveCfg = Debug|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|x64.ActiveCfg = Debug|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|x86.ActiveCfg = Debug|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|x86.Build.0 = Debug|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|Any CPU.ActiveCfg = Release|x86
-		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|ARM.ActiveCfg = Release|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|Mixed Platforms.Build.0 = Release|x86
-		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|x64.ActiveCfg = Release|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|x86.ActiveCfg = Release|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|x86.Build.0 = Release|x86
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|ARM.ActiveCfg = Release|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|x64.ActiveCfg = Release|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|x86.ActiveCfg = Release|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|ARM.ActiveCfg = Release|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|x64.ActiveCfg = Release|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|x86.ActiveCfg = Release|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|ARM.ActiveCfg = Release|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|x64.ActiveCfg = Release|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|x86.ActiveCfg = Release|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|ARM.ActiveCfg = Release|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|x64.ActiveCfg = Release|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|x86.ActiveCfg = Release|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|ARM.ActiveCfg = Release|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|x64.ActiveCfg = Release|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|x86.ActiveCfg = Release|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|ARM.ActiveCfg = Release|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|x64.ActiveCfg = Release|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|x86.ActiveCfg = Release|Any CPU
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Any CPU.Build.0 = Debug|x86
-		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|ARM.ActiveCfg = Debug|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|x64.ActiveCfg = Debug|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|x86.ActiveCfg = Debug|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|x86.Build.0 = Debug|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|Any CPU.ActiveCfg = Release|x86
-		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|ARM.ActiveCfg = Release|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|Mixed Platforms.Build.0 = Release|x86
-		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|x64.ActiveCfg = Release|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|x86.ActiveCfg = Release|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|x86.Build.0 = Release|x86
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|ARM.ActiveCfg = Release|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|x64.ActiveCfg = Release|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|x86.ActiveCfg = Release|Any CPU
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|Any CPU.Build.0 = Debug|x86
-		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|ARM.ActiveCfg = Debug|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|x64.ActiveCfg = Debug|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|x86.ActiveCfg = Debug|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|x86.Build.0 = Debug|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|Any CPU.ActiveCfg = Release|x86
-		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|ARM.ActiveCfg = Release|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|Mixed Platforms.Build.0 = Release|x86
-		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|x64.ActiveCfg = Release|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|x86.ActiveCfg = Release|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|x86.Build.0 = Release|x86
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Release|Any CPU.Build.0 = Release|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Release|ARM.ActiveCfg = Release|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Release|x64.ActiveCfg = Release|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Release|x86.ActiveCfg = Release|Any CPU
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|Any CPU.Build.0 = Debug|x86
-		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|ARM.ActiveCfg = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|x64.ActiveCfg = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|x86.ActiveCfg = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|x86.Build.0 = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|Any CPU.ActiveCfg = Release|x86
-		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|ARM.ActiveCfg = Release|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|Mixed Platforms.Build.0 = Release|x86
-		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|x64.ActiveCfg = Release|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|x86.ActiveCfg = Release|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|x86.Build.0 = Release|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|Any CPU.Build.0 = Debug|x86
-		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|ARM.ActiveCfg = Debug|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|x64.ActiveCfg = Debug|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|x86.ActiveCfg = Debug|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|x86.Build.0 = Debug|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|Any CPU.ActiveCfg = Release|x86
-		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|ARM.ActiveCfg = Release|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|Mixed Platforms.Build.0 = Release|x86
-		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|x64.ActiveCfg = Release|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|x86.ActiveCfg = Release|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|x86.Build.0 = Release|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|Any CPU.Build.0 = Debug|x86
-		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|ARM.ActiveCfg = Debug|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|x64.ActiveCfg = Debug|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|x86.ActiveCfg = Debug|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|x86.Build.0 = Debug|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|Any CPU.ActiveCfg = Release|x86
-		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|ARM.ActiveCfg = Release|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|Mixed Platforms.Build.0 = Release|x86
-		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|x64.ActiveCfg = Release|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|x86.ActiveCfg = Release|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|x86.Build.0 = Release|x86
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|ARM.ActiveCfg = Release|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|x64.ActiveCfg = Release|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|x86.ActiveCfg = Release|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|ARM.ActiveCfg = Release|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|x64.ActiveCfg = Release|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|x86.ActiveCfg = Release|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|ARM.ActiveCfg = Release|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|x64.ActiveCfg = Release|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|x86.ActiveCfg = Release|Any CPU
 		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|Any CPU.Build.0 = Debug|x86
-		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|ARM.ActiveCfg = Debug|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|x64.ActiveCfg = Debug|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|x86.ActiveCfg = Debug|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|x86.Build.0 = Debug|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Release|Any CPU.ActiveCfg = Release|x86
-		{160150D5-38E6-482D-97F5-2624F322A854}.Release|ARM.ActiveCfg = Release|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Release|Mixed Platforms.Build.0 = Release|x86
-		{160150D5-38E6-482D-97F5-2624F322A854}.Release|x64.ActiveCfg = Release|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Release|x86.ActiveCfg = Release|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Release|x86.Build.0 = Release|x86
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|ARM.ActiveCfg = Release|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|x64.ActiveCfg = Release|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|x86.ActiveCfg = Release|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|ARM.ActiveCfg = Release|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|x64.ActiveCfg = Release|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|x86.ActiveCfg = Release|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|ARM.ActiveCfg = Release|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|x64.ActiveCfg = Release|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|x86.ActiveCfg = Release|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|ARM.ActiveCfg = Release|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|x64.ActiveCfg = Release|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|x86.ActiveCfg = Release|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|ARM.ActiveCfg = Release|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|x64.ActiveCfg = Release|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|x86.ActiveCfg = Release|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|ARM.ActiveCfg = Release|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|x64.ActiveCfg = Release|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|x86.ActiveCfg = Release|Any CPU
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|Any CPU.Build.0 = Debug|x86
-		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|ARM.ActiveCfg = Debug|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|x64.ActiveCfg = Debug|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|x86.ActiveCfg = Debug|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|x86.Build.0 = Debug|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|Any CPU.ActiveCfg = Release|x86
-		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|ARM.ActiveCfg = Release|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|Mixed Platforms.Build.0 = Release|x86
-		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|x64.ActiveCfg = Release|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|x86.ActiveCfg = Release|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|x86.Build.0 = Release|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|Any CPU.Build.0 = Debug|x86
-		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|ARM.ActiveCfg = Debug|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|x64.ActiveCfg = Debug|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|x86.ActiveCfg = Debug|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|x86.Build.0 = Debug|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|Any CPU.ActiveCfg = Release|x86
-		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|ARM.ActiveCfg = Release|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|Mixed Platforms.Build.0 = Release|x86
-		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|x64.ActiveCfg = Release|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|x86.ActiveCfg = Release|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|x86.Build.0 = Release|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|Any CPU.Build.0 = Debug|x86
-		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|ARM.ActiveCfg = Debug|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|x64.ActiveCfg = Debug|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|x86.ActiveCfg = Debug|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|x86.Build.0 = Debug|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|Any CPU.ActiveCfg = Release|x86
-		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|ARM.ActiveCfg = Release|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|Mixed Platforms.Build.0 = Release|x86
-		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|x64.ActiveCfg = Release|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|x86.ActiveCfg = Release|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|x86.Build.0 = Release|x86
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|ARM.ActiveCfg = Release|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|x64.ActiveCfg = Release|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|x86.ActiveCfg = Release|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|ARM.ActiveCfg = Debug|ARM
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|ARM.Build.0 = Debug|ARM
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|x64.ActiveCfg = Debug|x64
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|x64.Build.0 = Debug|x64
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|x86.ActiveCfg = Debug|x86
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|x86.Build.0 = Debug|x86
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|ARM.ActiveCfg = Release|ARM
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|ARM.Build.0 = Release|ARM
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|Mixed Platforms.Build.0 = Release|x86
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|x64.ActiveCfg = Release|x64
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|x64.Build.0 = Release|x64
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|x86.ActiveCfg = Release|x86
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|x86.Build.0 = Release|x86
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|x86.ActiveCfg = Release|Any CPU
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Any CPU.Build.0 = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|x86.ActiveCfg = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|x86.Build.0 = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Any CPU.ActiveCfg = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mixed Platforms.Build.0 = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x86.ActiveCfg = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x86.Build.0 = Release|x86
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|x86.ActiveCfg = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -907,6 +728,8 @@ Global
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
 		{14B39F89-C9B0-407E-877A-B515C985E96E} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
 		{5BE49183-2F6F-4527-AC90-D816911FCF90} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
@@ -927,6 +750,7 @@ Global
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
 		{160150D5-38E6-482D-97F5-2624F322A854} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{49066074-3B7B-4A55-B122-6BD33AB73558} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{60D08399-244F-46A3-91F1-4CFD26D961A3} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
@@ -934,15 +758,14 @@ Global
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{5040A9C7-6DEC-4613-8586-A598C4070B35} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{566293A4-1187-4289-A28C-C74B499D46AA} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
-		{F5819204-4882-4F33-B973-DE6762C9682F} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{6A582788-C4D2-410C-96CD-177F75712D65} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
 		{CCB4679D-11AF-4EC6-AAA4-36619FCE70FA} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
 		{E4FFD875-95FC-48F2-8B6D-8483D0B71666} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
 		{BD648BB8-EF28-453C-B4F5-EE3C93EB4DAF} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
 		{6285F3EF-07DB-49C9-8CDE-A9092789FE4F} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
 		{32B91ACB-CC8A-4E43-A6F1-FC8F8CAA4D22} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
-		{97185A92-077D-4498-8B6A-8BFF04079044} = {6EDED295-0F32-4D05-A8EA-02F4BF89CF35}
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE} = {1436F7C9-29D3-4FEF-8914-10B45F13D142}
 		{04F6041E-475E-4B2A-A889-6A33EABD718B} = {1436F7C9-29D3-4FEF-8914-10B45F13D142}
 		{2B6D0EFF-7874-495F-9226-873ED9649C60} = {1436F7C9-29D3-4FEF-8914-10B45F13D142}
diff --git a/RenderSystems/ANX.Framework.Windows.GL3/Creator.cs b/RenderSystems/ANX.Framework.Windows.GL3/Creator.cs
index b7f7ecbe..d387cdd2 100644
--- a/RenderSystems/ANX.Framework.Windows.GL3/Creator.cs
+++ b/RenderSystems/ANX.Framework.Windows.GL3/Creator.cs
@@ -1,4 +1,3 @@
-#region Using Statements
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -8,10 +7,8 @@ using ANX.Framework.Graphics;
 using ANX.Framework.NonXNA;
 using ANX.Framework.NonXNA.Development;
 using ANX.Framework.NonXNA.RenderSystem;
-using OpenTK;
 using ANX.Framework.Windows.GL3;
-
-#endregion
+using OpenTK;
 
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
@@ -19,9 +16,6 @@ using ANX.Framework.Windows.GL3;
 
 namespace ANX.RenderSystem.Windows.GL3
 {
-	/// <summary>
-	/// OpenGL graphics creator.
-	/// </summary>
 	[PercentageComplete(90)]
 	[TestState(TestStateAttribute.TestState.Untested)]
 	public class Creator : IRenderSystemCreator
@@ -54,6 +48,14 @@ namespace ANX.RenderSystem.Windows.GL3
 					os == PlatformName.MacOSX;
 			}
 		}
+
+		public EffectSourceLanguage GetStockShaderSourceLanguage
+		{
+			get
+			{
+				return EffectSourceLanguage.GLSL_FX;
+			}
+		}
 		#endregion
 
 		#region CreateEffect
@@ -153,7 +155,6 @@ namespace ANX.RenderSystem.Windows.GL3
         #endregion
 #endif
 
-
 		#region CreateBlendState
 		/// <summary>
 		/// Create a new native blend state.
@@ -241,14 +242,6 @@ namespace ANX.RenderSystem.Windows.GL3
 		}
 		#endregion
 
-        public EffectSourceLanguage GetStockShaderSourceLanguage
-        {
-            get
-            {
-                return EffectSourceLanguage.GLSL_FX;
-            }
-        }
-
 		#region GetAdapterList (TODO)
 		/// <summary>
 		/// Get a list of available graphics adapter information.
@@ -327,6 +320,5 @@ namespace ANX.RenderSystem.Windows.GL3
         {
             return sourceLanguage == EffectSourceLanguage.GLSL_FX || sourceLanguage == EffectSourceLanguage.GLSL;
         }
-
     }
 }
diff --git a/RenderSystems/ANX.Framework.Windows.GL3/GraphicsDeviceWindowsGL3.cs b/RenderSystems/ANX.Framework.Windows.GL3/GraphicsDeviceWindowsGL3.cs
index e5e119bd..9d5460c6 100644
--- a/RenderSystems/ANX.Framework.Windows.GL3/GraphicsDeviceWindowsGL3.cs
+++ b/RenderSystems/ANX.Framework.Windows.GL3/GraphicsDeviceWindowsGL3.cs
@@ -13,9 +13,6 @@ using OpenTK.Platform;
 
 namespace ANX.RenderSystem.Windows.GL3
 {
-	/// <summary>
-	/// Native OpenGL implementation for a graphics device.
-	/// </summary>
 	public class GraphicsDeviceWindowsGL3 : INativeGraphicsDevice
 	{
 		#region Constants
@@ -76,17 +73,16 @@ namespace ANX.RenderSystem.Windows.GL3
 		#endregion
 
 		#region Constructor
-		/// <summary>
-		/// Create a new OpenGL graphics context.
-		/// </summary>
-		/// <param name="presentationParameters">Parameters for the window
-		/// and graphics context.</param>
-		internal GraphicsDeviceWindowsGL3(
-				PresentationParameters presentationParameters)
+		internal GraphicsDeviceWindowsGL3(PresentationParameters presentationParameters)
 		{
 			Current = this;
 			ResetDevice(presentationParameters);
 		}
+
+		~GraphicsDeviceWindowsGL3()
+		{
+			Dispose();
+		}
 		#endregion
 
 		#region ResetDevice
@@ -131,11 +127,9 @@ namespace ANX.RenderSystem.Windows.GL3
 			nativeContext = new GraphicsContext(graphicsMode, nativeWindowInfo);
 			nativeContext.MakeCurrent(nativeWindowInfo);
 			nativeContext.LoadAll();
+			nativeContext.ErrorChecking = false;
 
-			string version = GL.GetString(StringName.Version);
-			string[] parts = version.Split(new char[] { '.', ' ' });
-			cachedVersionMajor = int.Parse(parts[0]);
-			cachedVersionMinor = int.Parse(parts[1]);
+			GetOpenGLVersion();
 
 			GL.Viewport(0, 0, presentationParameters.BackBufferWidth, presentationParameters.BackBufferHeight);
 
@@ -143,6 +137,17 @@ namespace ANX.RenderSystem.Windows.GL3
 		}
 		#endregion
 
+		#region GetOpenGLVersion
+		private void GetOpenGLVersion()
+		{
+			string version = GL.GetString(StringName.Version);
+			Logger.Info("OpenGL version: " + version);
+			string[] parts = version.Split(new char[] { '.', ' ' });
+			cachedVersionMajor = int.Parse(parts[0]);
+			cachedVersionMinor = int.Parse(parts[1]);
+		}
+		#endregion
+
 		#region CreateWindowInfo
 		private void CreateWindowInfo(IntPtr windowHandle, IntPtr graphicsModeHandle)
 		{
@@ -169,10 +174,6 @@ namespace ANX.RenderSystem.Windows.GL3
 		#endregion
 
 		#region SetViewport
-		/// <summary>
-		/// Set the OpenGL viewport.
-		/// </summary>
-		/// <param name="viewport">Viewport data to set natively.</param>
 		public void SetViewport(Viewport viewport)
 		{
 			GL.Viewport(viewport.X, viewport.Y, viewport.Width, viewport.Height);
@@ -379,8 +380,7 @@ namespace ANX.RenderSystem.Windows.GL3
 		#endregion
 
 		#region ResizeRenderWindow
-		private void ResizeRenderWindow(
-			PresentationParameters presentationParameters)
+		private void ResizeRenderWindow(PresentationParameters presentationParameters)
 		{
 			if (OpenTK.Configuration.RunningOnWindows)
 			{
@@ -471,10 +471,16 @@ namespace ANX.RenderSystem.Windows.GL3
 			activeEffect = null;
 			boundRenderTargets = null;
 
-			nativeContext.Dispose();
-			nativeContext = null;
-			nativeWindowInfo.Dispose();
-			nativeWindowInfo = null;
+			if (nativeContext != null)
+			{
+				nativeContext.Dispose();
+				nativeContext = null;
+			}
+			if (nativeWindowInfo != null)
+			{
+				nativeWindowInfo.Dispose();
+				nativeWindowInfo = null;
+			}
 		}
 		#endregion
 	}
diff --git a/Samples/AudioSample/Assets/Logo.png b/Samples/AudioSample/Assets/Logo.png
new file mode 100644
index 00000000..ab28e66b
Binary files /dev/null and b/Samples/AudioSample/Assets/Logo.png differ
diff --git a/Samples/AudioSample/Assets/SmallLogo.png b/Samples/AudioSample/Assets/SmallLogo.png
new file mode 100644
index 00000000..c4a32ab0
Binary files /dev/null and b/Samples/AudioSample/Assets/SmallLogo.png differ
diff --git a/Samples/AudioSample/Assets/SplashScreen.png b/Samples/AudioSample/Assets/SplashScreen.png
new file mode 100644
index 00000000..8d204826
Binary files /dev/null and b/Samples/AudioSample/Assets/SplashScreen.png differ
diff --git a/Samples/AudioSample/Assets/StoreLogo.png b/Samples/AudioSample/Assets/StoreLogo.png
new file mode 100644
index 00000000..55690e28
Binary files /dev/null and b/Samples/AudioSample/Assets/StoreLogo.png differ
diff --git a/Samples/AudioSample/AudioSample_Linux.csproj b/Samples/AudioSample/AudioSample_Linux.csproj
index eec2db67..552d2461 100644
--- a/Samples/AudioSample/AudioSample_Linux.csproj
+++ b/Samples/AudioSample/AudioSample_Linux.csproj
@@ -97,6 +97,10 @@
       <Project>{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}</Project>
       <Name>ANX.SoundSystem.OpenAL</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_Linux.csproj">
+      <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
+      <Name>ANX.SoundSystem.Windows.XAudio</Name>
+    </ProjectReference>
     <ProjectReference Include="..\SampleContent\SampleContent.contentproj">
       <Project>{FA6E229D-4504-47B1-8A23-2D3FCC13F778}</Project>
       <Name>SampleContent</Name>
diff --git a/Samples/AudioSample/AudioSample_PSVita.csproj b/Samples/AudioSample/AudioSample_PSVita.csproj
index 7fd6bbe0..bf7d9d6c 100644
--- a/Samples/AudioSample/AudioSample_PSVita.csproj
+++ b/Samples/AudioSample/AudioSample_PSVita.csproj
@@ -100,6 +100,10 @@
       <Project>{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}</Project>
       <Name>ANX.SoundSystem.OpenAL</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_PSVita.csproj">
+      <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
+      <Name>ANX.SoundSystem.Windows.XAudio</Name>
+    </ProjectReference>
     <ProjectReference Include="..\SampleContent\SampleContent.contentproj">
       <Project>{FA6E229D-4504-47B1-8A23-2D3FCC13F778}</Project>
       <Name>SampleContent</Name>
diff --git a/Samples/AudioSample/AudioSample_WindowsMetro.csproj b/Samples/AudioSample/AudioSample_WindowsMetro.csproj
new file mode 100644
index 00000000..a592ca13
--- /dev/null
+++ b/Samples/AudioSample/AudioSample_WindowsMetro.csproj
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}</ProjectGuid>
+    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>AppContainerExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>AudioSample</RootNamespace>
+    <AssemblyName>AudioSample</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <FileAlignment>512</FileAlignment>
+    <PackageCertificateKeyFile>Test_TemporaryKey.pfx</PackageCertificateKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\x86\Debug</OutputPath>
+    <DefineConstants>WINDOWS;TRACE;DEBUG;WINDOWSMETRO;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\x86\Release</OutputPath>
+    <DefineConstants>WINDOWS;TRACE;WINDOWSMETRO;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib" />
+    <Reference Include="System">
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Game1.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Game.ico" />
+    <Content Include="GameThumbnail.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_WindowsMetro.csproj">
+      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
+      <Name>ANX.Framework</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\InputSystems\ANX.InputDevices.Windows.XInput\ANX.InputDevices.Windows.XInput_WindowsMetro.csproj">
+      <Project>{60D08399-244F-46A3-91F1-4CFD26D961A3}</Project>
+      <Name>ANX.InputDevices.Windows.XInput</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\InputSystems\ANX.InputSystem.Standard\ANX.InputSystem.Standard_WindowsMetro.csproj">
+      <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
+      <Name>ANX.InputSystem.Standard</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj">
+      <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
+      <Name>ANX.SoundSystem.Windows.XAudio</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\SampleContent\SampleContent.contentproj">
+      <Project>{FA6E229D-4504-47B1-8A23-2D3FCC13F778}</Project>
+      <Name>SampleContent</Name>
+      <XnaReferenceType>Content</XnaReferenceType>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <!--
+      To modify your build process, add your task inside one of the targets below and uncomment it. 
+      Other similar extension points exist, see Microsoft.Common.targets.
+      <Target Name="BeforeBuild">
+      </Target>
+      <Target Name="AfterBuild">
+      </Target>
+    -->
+  <ItemGroup>
+    <None Include="Test_TemporaryKey.pfx" />
+    <AppxManifest Include="Manifest.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <Content Include="Assets\Logo.png" />
+    <Content Include="Assets\SmallLogo.png" />
+    <Content Include="Assets\SplashScreen.png" />
+    <Content Include="Assets\StoreLogo.png" />
+  </ItemGroup>
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
+    <VisualStudioVersion>11.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+</Project>
\ No newline at end of file
diff --git a/Samples/AudioSample/Manifest.appxmanifest b/Samples/AudioSample/Manifest.appxmanifest
new file mode 100644
index 00000000..15392f31
--- /dev/null
+++ b/Samples/AudioSample/Manifest.appxmanifest
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
+  <Identity Name="AudioSample" Publisher="CN=ANX-Team" Version="1.0.0.0" />
+  <Properties>
+    <DisplayName>AudioSample</DisplayName>
+    <PublisherDisplayName>ANX Developer Team</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+  <Prerequisites>
+    <OSMinVersion>6.2.0</OSMinVersion>
+    <OSMaxVersionTested>6.2.0</OSMaxVersionTested>
+  </Prerequisites>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="WindowsGame1.Program">
+      <VisualElements DisplayName="AudioSample" Logo="Assets\Logo.png" SmallLogo="Assets\SmallLogo.png" Description="AudioSample" ForegroundText="light" BackgroundColor="#464646">
+        <DefaultTile ShowName="allLogos" ShortName="AudioSample" />
+        <SplashScreen Image="Assets\SplashScreen.png" />
+      </VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="internetClient" />
+  </Capabilities>
+</Package>
\ No newline at end of file
diff --git a/Samples/KeyboardSample/KeyboardSample_WindowsMetro.csproj b/Samples/KeyboardSample/KeyboardSample_WindowsMetro.csproj
index 0064da47..8c9edbd8 100644
--- a/Samples/KeyboardSample/KeyboardSample_WindowsMetro.csproj
+++ b/Samples/KeyboardSample/KeyboardSample_WindowsMetro.csproj
@@ -36,6 +36,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin8|x86'">
     <OutputPath>bin\x86\DebugWin8\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin8|x86'">
     <OutputPath>bin\x86\ReleaseWin8\</OutputPath>
@@ -53,6 +54,9 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>KeyboardSample.Program</StartupObject>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
@@ -85,10 +89,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/Kinect/Kinect_WindowsMetro.csproj b/Samples/Kinect/Kinect_WindowsMetro.csproj
index f778fc98..cfb8f2c9 100644
--- a/Samples/Kinect/Kinect_WindowsMetro.csproj
+++ b/Samples/Kinect/Kinect_WindowsMetro.csproj
@@ -90,10 +90,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/ModelSample/ModelSample/ModelSample_WindowsMetro.csproj b/Samples/ModelSample/ModelSample/ModelSample_WindowsMetro.csproj
index edb113cb..ebdf5beb 100644
--- a/Samples/ModelSample/ModelSample/ModelSample_WindowsMetro.csproj
+++ b/Samples/ModelSample/ModelSample/ModelSample_WindowsMetro.csproj
@@ -85,10 +85,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SampleContent\SampleContent.contentproj">
       <Project>{FA6E229D-4504-47B1-8A23-2D3FCC13F778}</Project>
       <Name>SampleContent</Name>
diff --git a/Samples/MultiRenderTarget/MultiRenderTarget_WindowsMetro.csproj b/Samples/MultiRenderTarget/MultiRenderTarget_WindowsMetro.csproj
index 2183e5b2..2ffc6d64 100644
--- a/Samples/MultiRenderTarget/MultiRenderTarget_WindowsMetro.csproj
+++ b/Samples/MultiRenderTarget/MultiRenderTarget_WindowsMetro.csproj
@@ -85,10 +85,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/Primitives/Primitives_WindowsMetro.csproj b/Samples/Primitives/Primitives_WindowsMetro.csproj
index 89431f15..9d324c34 100644
--- a/Samples/Primitives/Primitives_WindowsMetro.csproj
+++ b/Samples/Primitives/Primitives_WindowsMetro.csproj
@@ -86,10 +86,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/RecordingSample/RecordingSample_WindowsMetro.csproj b/Samples/RecordingSample/RecordingSample_WindowsMetro.csproj
index 9d2a94e9..cf3d6f88 100644
--- a/Samples/RecordingSample/RecordingSample_WindowsMetro.csproj
+++ b/Samples/RecordingSample/RecordingSample_WindowsMetro.csproj
@@ -87,10 +87,6 @@
       <Project>{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}</Project>
       <Name>ANX.InputSystem.Recording</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Samples\SampleContent\SampleContent.contentproj">
       <Project>{FA6E229D-4504-47B1-8A23-2D3FCC13F778}</Project>
       <Name>SampleContent</Name>
diff --git a/Samples/RenderTarget/RenderTarget_WindowsMetro.csproj b/Samples/RenderTarget/RenderTarget_WindowsMetro.csproj
index bd028e91..812a3195 100644
--- a/Samples/RenderTarget/RenderTarget_WindowsMetro.csproj
+++ b/Samples/RenderTarget/RenderTarget_WindowsMetro.csproj
@@ -87,10 +87,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/SimpleSprite/SimpleSprite_WindowsMetro.csproj b/Samples/SimpleSprite/SimpleSprite_WindowsMetro.csproj
index 09726a1e..1154ddc1 100644
--- a/Samples/SimpleSprite/SimpleSprite_WindowsMetro.csproj
+++ b/Samples/SimpleSprite/SimpleSprite_WindowsMetro.csproj
@@ -66,10 +66,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/StencilBuffer/StencilBuffer_WindowsMetro.csproj b/Samples/StencilBuffer/StencilBuffer_WindowsMetro.csproj
index 698aa138..8ea35ac4 100644
--- a/Samples/StencilBuffer/StencilBuffer_WindowsMetro.csproj
+++ b/Samples/StencilBuffer/StencilBuffer_WindowsMetro.csproj
@@ -95,10 +95,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/TextRendering/TextRendering_WindowsMetro.csproj b/Samples/TextRendering/TextRendering_WindowsMetro.csproj
index ab982e30..634dd64f 100644
--- a/Samples/TextRendering/TextRendering_WindowsMetro.csproj
+++ b/Samples/TextRendering/TextRendering_WindowsMetro.csproj
@@ -87,10 +87,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/VertexIndexBuffer/VertexIndexBuffer_WindowsMetro.csproj b/Samples/VertexIndexBuffer/VertexIndexBuffer_WindowsMetro.csproj
index f3fc76e1..13093ce9 100644
--- a/Samples/VertexIndexBuffer/VertexIndexBuffer_WindowsMetro.csproj
+++ b/Samples/VertexIndexBuffer/VertexIndexBuffer_WindowsMetro.csproj
@@ -86,10 +86,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj b/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj
index de8940c7..b2cf9dbd 100644
--- a/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj
+++ b/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj
@@ -67,10 +67,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj b/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj
index d0ba1f21..c46c0211 100644
--- a/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj
+++ b/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj
@@ -98,10 +98,6 @@
       <Project>{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}</Project>
       <Name>ANX.InputDevices.OpenTK</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\InputSystems\ANX.InputDevices.Windows.Kinect\ANX.InputDevices.Windows.Kinect_WindowsMetro.csproj">
-      <Project>{E5D69E75-D77C-493F-BBDA-6F9E73B82549}</Project>
-      <Name>ANX.InputDevices.Windows.Kinect</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\InputSystems\ANX.InputDevices.Windows.XInput\ANX.InputDevices.Windows.XInput_WindowsMetro.csproj">
       <Project>{60D08399-244F-46A3-91F1-4CFD26D961A3}</Project>
       <Name>ANX.InputDevices.Windows.XInput</Name>
@@ -114,10 +110,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/WpfEditor/WpfEditor_WindowsMetro.csproj b/Samples/WpfEditor/WpfEditor_WindowsMetro.csproj
index dd21b4d7..0e8ab079 100644
--- a/Samples/WpfEditor/WpfEditor_WindowsMetro.csproj
+++ b/Samples/WpfEditor/WpfEditor_WindowsMetro.csproj
@@ -107,10 +107,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj
index 8c998402..1c7ebb80 100644
--- a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj
+++ b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj
@@ -72,18 +72,16 @@
     <Compile Include="OpenALSoundEffectInstance.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SupportedPlatformsImpl.cs" />
-    <Compile Include="Wave\ALaw.cs" />
-    <Compile Include="Wave\MsAdpcm.cs" />
-    <Compile Include="Wave\MuLaw.cs" />
-    <Compile Include="Wave\WaveFile.cs" />
-    <Compile Include="Wave\WaveFormat.cs" />
-    <Compile Include="Wave\WaveInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_WindowsMetro.csproj">
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tools\WaveUtils\WaveUtils.csproj">
+      <Project>{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}</Project>
+      <Name>WaveUtils</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_Linux.csproj b/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_Linux.csproj
index 02e00663..dadd3d6e 100644
--- a/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_Linux.csproj
+++ b/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_Linux.csproj
@@ -49,13 +49,19 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="SharpDX, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.dll</HintPath>
+    </Reference>
     <Reference Include="SharpDX.XAudio2">
-      <HintPath>..\..\lib\SharpDX\Bin\SharpDX.XAudio2.dll</HintPath>
+      <HintPath>..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.XAudio2.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Creator.cs" />
+    <Compile Include="XAudioSoundEffectInstance.cs" />
+    <Compile Include="XAudioSoundEffect.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SupportedPlatformsImpl.cs" />
   </ItemGroup>
diff --git a/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_PSVita.csproj b/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_PSVita.csproj
index 0de45ef5..a43896d8 100644
--- a/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_PSVita.csproj
+++ b/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_PSVita.csproj
@@ -49,14 +49,20 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="SharpDX, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.dll</HintPath>
+    </Reference>
     <Reference Include="SharpDX.XAudio2">
-      <HintPath>..\..\lib\SharpDX\Bin\SharpDX.XAudio2.dll</HintPath>
+      <HintPath>..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.XAudio2.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Creator.cs" />
+    <Compile Include="XAudioSoundEffectInstance.cs" />
+    <Compile Include="XAudioSoundEffect.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SupportedPlatformsImpl.cs" />
   </ItemGroup>
diff --git a/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj b/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj
index 9fb76300..7ac8fb12 100644
--- a/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj
+++ b/SoundSystems/ANX.SoundSystem.Windows.XAudio/ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj
@@ -51,13 +51,19 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="SharpDX, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.dll</HintPath>
+    </Reference>
     <Reference Include="SharpDX.XAudio2">
-      <HintPath>..\..\lib\SharpDX\Bin\SharpDX.XAudio2.dll</HintPath>
+      <HintPath>..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.XAudio2.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Creator.cs" />
+    <Compile Include="XAudioSoundEffectInstance.cs" />
+    <Compile Include="XAudioSoundEffect.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SupportedPlatformsImpl.cs" />
   </ItemGroup>
diff --git a/Tools/ProjectConverter/Program.cs b/Tools/ProjectConverter/Program.cs
index 896fc1e8..9124ad73 100644
--- a/Tools/ProjectConverter/Program.cs
+++ b/Tools/ProjectConverter/Program.cs
@@ -23,7 +23,9 @@ namespace ProjectConverter
             //
             // To restore "old" behaviour use:
             //   ProjectConverter /linux /psvita /windowsmetro ../../ANX.Framework.sln
-            //
+			//
+			// For testing only
+			//args = new string[] { "/linux", "/psvita", "/windowsmetro", "../../ANX.Framework.sln" };
 
             List<string> switches = new List<string>();
             Dictionary<string, string> keyValueParameters = new Dictionary<string,string>();
diff --git a/lib/OpenAL/License.txt b/lib/OpenAL/License.txt
new file mode 100644
index 00000000..d4149bc5
--- /dev/null
+++ b/lib/OpenAL/License.txt
@@ -0,0 +1,10 @@
+OpenAL cross platform audio library
+Copyright (C) 1999-2000 by authors.
+This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General PublicLicense as published by the Free Software Foundation;
+either version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Or go to http://www.gnu.org/copyleft/lgpl.html
diff --git a/lib/OpenAL/OpenAL32.dll b/lib/OpenAL/OpenAL32.dll
new file mode 100644
index 00000000..d0ee3cc5
Binary files /dev/null and b/lib/OpenAL/OpenAL32.dll differ
diff --git a/lib/OpenAL/wrap_oal.dll b/lib/OpenAL/wrap_oal.dll
new file mode 100644
index 00000000..91e90fcd
Binary files /dev/null and b/lib/OpenAL/wrap_oal.dll differ