Merge branch 'dev-nico' into 'master'

src/components/NavBar.js

src/components/ShowTokenButton.js

src/components/basket/MyBasketButton.js

src/contexts/GlobalContext.js

src/routes/Routes.js

src/utils/ShowTimeLeft.js