Merge branch 'dev-nico' into 'master'

src/components/basket/FormatShoppingItem.js

src/components/basket/MyBasketPage.js

src/components/query/ApertifResults.js

src/components/query/QueryADEX.js

src/components/query/QueryCatalogs.js

src/components/query/QueryIVOARegistry.js

src/components/services/Interactive.js

src/components/services/Rucio.js

src/components/services/layout/ApertifResultsLayout.js

src/components/services/layout/AstronVOLayout.js

src/components/services/query_results/ASTRONVOResults.js

src/components/services/query_results/ApertifResults.js

src/components/services/query_results/LOFARResults.js

src/components/services/query_results/QueryResults.js

src/components/services/query_results/RucioResults.js

src/components/services/query_results/SampResults.js

src/components/services/query_results/VORegListResults.js

src/components/services/query_results/VOServiceResults.js

src/components/services/query_results/ZooniverseResults.js

src/components/services/samp/ReactVOTable.js