Merge branch 'develop' into feature/ss-rendering

Author: aeagle

.gitignore

@@ -22,4 +22,5 @@ yarn-debug.log*
 yarn-error.log*
 **/.rpt2_cache
 **/.next
-**/storybook-static
+**/storybook-static
+.vscode