Merge branch 'develop' into feature/resize-handles

# Conflicts:
#	package-lock.json

Author: aeagle

.gitignore

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