resolve merge conflict

www/include/configuration/configDowntime/ajaxForms.php

www/include/configuration/configDowntime/formDowntime.php

www/include/monitoring/recurrentDowntime/formDowntime.html

...clude/monitoring/recurrentDowntime/templates/general.html

...monitoring/recurrentDowntime/templates/monthly_basis.html

...monitoring/recurrentDowntime/templates/specific_date.html

.../monitoring/recurrentDowntime/templates/weekly_basis.html

www/install/createTables.sql

www/install/sql/centreon/Update-DB-2.8.4_to_2.8.5.sql