Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into features/US158_423_harmonize_buttons_gaz_water