Merge branch 'develop' into fix/bc-save-develop

docs/user-guide/solver/04-parameters.md

@@ -440,7 +440,7 @@ _**This section is under construction**_
 - **Default value:** `false`
 - **Usage:** set to `true` to activate writing the raw optimization results, that is
   - For each variable, optimal values (saved in output/output-name/optimal-values-y-w--optim-nb-z.txt) and reduced costs (saved in output/output-name/reduced-costs-y-w--optim-nb-z.txt) 
-  - each constraint, the marginal cost is saved in output/output-name/marinal-costs-y-w--optim-nb-z.txt
+  - each constraint, the marginal cost is saved in output/output-name/marginal-costs-y-w--optim-nb-z.txt
 where y is the year number (starting from 1), w is the week number (starting from 1) and z is the optimization index (1 or 2).
 
 This is an advanced option intended to help developers and advanced users better understand their simulation results.