Merge branch 'dev' into features/US142-right-badges-design

...nerComponents/FluidChartContainer/FluidChartContainer.tsx

...tComponents/ConsumptionNavigator/ActivateHalfHourLoad.tsx

...onents/ContentComponents/FluidChart/FluidChartContent.tsx

src/locales/en.json

src/services/consumptionDataManagerService.ts

src/services/queryRunnerService.ts

src/styles/base/_layout.scss