Merge remote-tracking branch 'origin/master'

# Conflicts:

#	TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache

#	TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt

#	TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
#	TimeHACK.Main/bin/Release/TimeHACK.application
#	TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache

#	TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
#	TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache

#	TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache
#	TimeHACK.Main/obj/Release/TimeHACK.application

3 files changed, 21 insertions, 4 deletions

diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application
index 82e01bf..5636705 100644
--- a/TimeHACK.Main/bin/Release/TimeHACK.application
+++ b/TimeHACK.Main/bin/Release/TimeHACK.application
@@ -7,14 +7,22 @@
     <framework targetVersion="4.5.2" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
+<<<<<<< HEAD
     <dependentAssembly dependencyType="install" codebase="TimeHACK.exe.manifest" size="20452">
+=======
+    <dependentAssembly dependencyType="install" codebase="TimeHACK.exe.manifest" size="25070">
+>>>>>>> origin/master
       <assemblyIdentity name="TimeHACK.exe" version="1.0.1.0" publicKeyToken="0000000000000000" language="en" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+<<<<<<< HEAD
         <dsig:DigestValue>esByQlyDRM46U3W/e6t9cu2R/zGQlSsEzPD2CdhyzAA=</dsig:DigestValue>
+=======
+        <dsig:DigestValue>FLFyLhgh/00187VHfEwpMWCgaYVgEkJOBemU56+LWss=</dsig:DigestValue>
+>>>>>>> origin/master
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application
index 83d1107..e265f99 100644
--- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application
+++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application
@@ -7,14 +7,14 @@
     <framework targetVersion="4.5.2" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="TimeHACK.exe.manifest" size="24638">
+    <dependentAssembly dependencyType="install" codebase="TimeHACK.exe.manifest" size="25070">
       <assemblyIdentity name="TimeHACK.exe" version="1.0.1.0" publicKeyToken="0000000000000000" language="en" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>5a9h2X2t0Dj9rJMnIryLPsaET63h0tHbHFwSEBh2QPA=</dsig:DigestValue>
+        <dsig:DigestValue>FLFyLhgh/00187VHfEwpMWCgaYVgEkJOBemU56+LWss=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest
index 1d7c3d4..fb36093 100644
--- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest
+++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest
@@ -63,7 +63,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>plR98K+NhvVW+NWDVr/6Ridl1ZBQjbEHLs+io1Ljf4k=</dsig:DigestValue>
+        <dsig:DigestValue>U7Kekeyx6Ql+9uqUNh8/OwQYQaKLz8r3pS1n2eI6994=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -75,7 +75,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>JcbRZTkAsDszUwGNpbxDF8k8HOqul6OO1xlMBp+H1As=</dsig:DigestValue>
+        <dsig:DigestValue>egCP83neM3apVMcIH6zkNIiRVob2rALwSMmYPhotJik=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -457,6 +457,15 @@
       <dsig:DigestValue>yrDBF1QPiJUsw5OapnDIEykQ8dj5guyF87IFQaEAs2w=</dsig:DigestValue>
     </hash>
   </file>
+  <file name="Resources\WinClassic\Window\sliversilver.png" size="156">
+    <hash>
+      <dsig:Transforms>
+        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
+      </dsig:Transforms>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+      <dsig:DigestValue>T9l945vYoKcCSIEDDqot2H3OVrkVxqkoQ/E6pZokY8g=</dsig:DigestValue>
+    </hash>
+  </file>
   <file name="Resources\WinClassic\Window\TopLeft.png" size="170">
     <hash>
       <dsig:Transforms>