Merge branch 'main' of https://github.com/easylogic/editor into main