merge with domi
Merge branch 'master' of github.com:domi-ngo/comicstrip_editor
fixed merge