[REFACTORING] Fix after merge request

apps/maarch_entreprise/lang/en.php

apps/maarch_entreprise/lang/fr.php

apps/maarch_entreprise/log.php

apps/maarch_entreprise/xml/services.xml

migration/18.10/migrateLdap.php

sql/data_fr.sql

sql/develop.sql

src/app/basket/controllers/BasketController.php

src/app/basket/models/BasketModelAbstract.php

src/core/controllers/AuthenticationController.php

src/core/controllers/PasswordController.php

src/core/lang/lang-en.php

src/core/lang/lang-fr.php

src/core/models/PasswordModel.php