Merge remote-tracking branch 'upstream/master'

engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h

@@ -9,9 +9,9 @@
 #include "sharedFoundation/NetworkId.h"
 #include "sharedNetworkMessages/CustomerServiceCategory.h"
 #include <vector>
-
-extern "C" {
 #include "libxml/parser.h"
+extern "C" {
+
 }
 
 using namespace CSAssist;

engine/server/library/serverUtility/src/shared/AdminAccountManager.cpp

@@ -160,6 +160,7 @@ void AdminAccountManager::reload()
 	DEBUG_FATAL(!ms_installed, ("AdminAccountManager not installed"));
 	NOT_NULL(ms_dataTableName);
 	DataTableManager::reload(*ms_dataTableName);
+	ms_adminTable = DataTableManager::getTable (ms_dataTableName->c_str(), true);
 }
 
 //-----------------------------------------------------------------------