Merge branch 'dev' of...

src/assets/icons/tabbar/grand-lyon.svg

src/assets/png/badges/CHA00000003-0.png

src/assets/png/badges/CHA00000003-1.png

src/components/CommonKit/Button/StyledButton.tsx

src/components/CommonKit/Button/StyledOauthButton.tsx

...s/ViewContainer/FinishedChallengeDetailsViewContainer.tsx

...nts/ViewContainer/LockedChallengeDetailsViewContainer.tsx

...s/ContentComponents/Challenge/FollowChallengeTimeline.tsx

...nts/ContentComponents/ChallengeList/ChallengeListItem.tsx

...onents/ContentComponents/ChallengeList/ChallengesList.tsx

...nents/ContentComponents/ChallengeModal/ChallengeModal.tsx

...nts/ContentComponents/EcogestureModal/EcogestureModal.tsx

src/components/ContentComponents/Navbar/Navbar.tsx

src/db/challengeTypeData.json

src/locales/en.json

src/services/challengeDataManagerService.ts

src/styles/components/_challenges.scss

src/styles/components/_ecogesture.scss

src/styles/components/_nav.scss

src/styles/components/_oauth.scss