Merge branch 'dev' into features/notifications

# Conflicts:
#	package-lock.json
#	package.json
#	src/components/Header/Header.jsx

.gitignore

@@ -1,3 +1,5 @@
+.env
+
 # Logs
 logs
 *.log
@@ -24,6 +26,4 @@ dist-ssr
 *.sw?
 
 *storybook.log
-storybook-static
-
-.env
+storybook-static