08 Apr - Merge remote-tracking branch 'origin/master' into darksideofmakerlog # Conflicts: # src/components/badges/index.js # src/features/stream/components/Editor/Editor.scss # src/features/stream/components/NoActivityCard/NoActivityCard.css # src/features/stream/components/NoActivityCard/NoActivityCard.js # src/features/stream/components/Stream/components/StreamSection/StreamDateHeader.js # src/features/stream/components/Task/components/Praise/Praisable.js # src/layouts/Navbar/components/LoggedInMenu.js # src/layouts/Page.js # src/pages/DiscussionsPage/DiscussionsPage.js # src/pages/HomePage/HomePage.js # src/pages/RegisterPage/RegisterPage.js # src/pages/StreamPage/components/StreamHeader.js