Merge branch 'master' of github.com:figa12/CCS-tool into editor
Merge branch 'editor' of github.com:figa12/CCS-tool into editor
Cleaned up main.ts + minor changes to activity handler