Bug fixes

Merge remote-tracking branch 'remotes/origin/develop'

# Conflicts:
#	README.md
#	package.json
#	src/Editor.tsx
#	src/FusionExport.tsx
#	src/main.css
#	src/types.ts