Merge remote-tracking branch 'origin/master' into darksideofmakerlog # Conflicts: # src/features/products/components/Product/Product.js # src/features/products/components/Product/components/ProductMedia/ProductMedia.js # src/features/products/components/ProductCreateWizard/ProductCreateWizard.js # src/layouts/Footer/index.js # src/layouts/Navbar/components/LoggedInMenu.js # src/pages/LoginPage/components/LoginForm.js # src/pages/RegisterPage/RegisterPage.js