Fix merge conflits

www/class/centreonExternalCommand.class.php

www/class/centreonGMT.class.php

www/class/centreonHost.class.php

www/class/centreonService.class.php

www/class/config-generate/contact.class.php

www/class/config-generate/host.class.php

www/htmlHeader.php

...nclude/Administration/corePerformance/processCommands.php

www/include/Administration/corePerformance/processInfo.php

www/include/common/javascript/ajaxMonitoring.js

www/include/common/javascript/autologout.php

www/include/common/javascript/autologoutXMLresponse.php

www/include/common/javascript/centreon/hostResolve.js

www/include/common/javascript/codebase/dhtmlxtree.php

...mmon/javascript/topCounterStatus/ajaxStatusCounter.js.php

...webServices/rest/centreon_configuration_contact.class.php

...rvices/rest/centreon_configuration_contactgroup.class.php

...clude/configuration/configObject/host/resolveHostName.php

www/include/eventLogs/GetCSVLog.php

www/include/eventLogs/GetXmlLog.php