Merge branch 'master' into dev_1.2
Merge branch 'master' into dev_1.2

--- a/API/VOIDCore.cs
+++ b/API/VOIDCore.cs
@@ -113,7 +113,7 @@
 				{
 					ToadicusTools.Logging.PostDebugMessage(this, "Checking invoker {0}", invoker);
 
-					if (invoker == method)
+					if (System.Object.Equals(invoker, method))
 					{
 						ToadicusTools.Logging.PostDebugMessage(this, "Found match.");
 						return true;
@@ -141,7 +141,7 @@
 				{
 					ToadicusTools.Logging.PostDebugMessage(this, "Checking invoker {0}", invoker);
 
-					if (invoker == method)
+					if (System.Object.Equals(invoker, method))
 					{
 						ToadicusTools.Logging.PostDebugMessage(this, "Found match.");
 						return true;

--- a/VOID.csproj
+++ b/VOID.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug_win</Configuration>
@@ -39,7 +39,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <CustomCommands>
       <CustomCommands>
         <Command>
@@ -139,12 +140,10 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Reference Include="System">
-      <HintPath>..\_KSPAssemblies\System.dll</HintPath>
-    </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\_KSPAssemblies\Assembly-CSharp.dll</HintPath>
     </Reference>
+    <Reference Include="System" />
     <Reference Include="UnityEngine">
       <HintPath>..\_KSPAssemblies\UnityEngine.dll</HintPath>
     </Reference>
@@ -168,10 +167,9 @@
   <ItemGroup>
     <None Include="GameData\VOID\Textures\ATM_VOID.cfg" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="API\" />
-    <Folder Include="Tools\" />
-    <Folder Include="API\Attributes\" />
-  </ItemGroup>
+  <ItemGroup />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy /Y $(TargetPath) $(ProjectDir)GameData\$(ProjectName)\Plugins\</PostBuildEvent>
+  </PropertyGroup>
 </Project>