Merge remote-tracking branch 'origin/master' into darksideofmakerlog # Conflicts: # src/features/milestones/components/MilestoneMedia.js # src/features/notifications/components/NotificationsView.js # src/features/notifications/notifications.css # src/features/projects/components/TodayView.js # src/features/search/components/GlobalSearchBar/index.js # src/features/stream/components/Stream/components/StreamCard/StreamCard.js # src/features/stream/components/Stream/components/StreamSection/StreamDateHeader.js # src/layouts/Footer/index.js # src/layouts/Navbar/components/LoggedInMenu.js # src/layouts/Navbar/index.js # src/layouts/Navbar/style.css # src/layouts/Page.js # src/pages/AppsPage/index.js # src/pages/HomePage/HomePage.js # src/pages/StatsPage/index.js # src/pages/StreamPage/StreamPage.js # src/pages/TasksPage/screens/StatsTab/StatsTab.js