Merge branch 'master' into ExtraMercs

Editor/EditorMercs.cpp

@@ -1,12 +1,7 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "Editor All.h"
-#else
 	#include "builddefines.h"
-#endif
 
 #ifdef JA2EDITOR
 
-#ifndef PRECOMPILEDHEADERS
 	#include <windows.h>
 	#include "tiledef.h"
 	#include "edit_sys.h"
@@ -64,7 +59,6 @@
 	#include "message.h"
 	#include "InterfaceItemImages.h"
 	#include "english.h"
-#endif
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
 class SOLDIERTYPE;