Merge branch 'dev-nico' into 'master'

src/components/MyShoppingBasket.js

src/components/NavBar.js

src/components/basket/AddToBasketCheckBox.js

src/components/basket/LoadBasket.js

src/components/basket/MyBasketButton.js

src/components/basket/MyBasketPage.js

src/components/basket/SaveBasketButton.js

src/components/basket/databasket_obsolete.js

src/components/basket/dataset_obsolete.js

src/components/query/ASTRONVOResults.js

src/components/query/ApertifResults.js

src/components/query/ZooniverseResults.js

src/components/query/samp/SampGrid.js

src/components/query/samp/SampPage.js

src/contexts/BasketContext.js

src/routes/Routes.js