new editing, new jpg odg files
Merge remote branch 'remotes/origin/master'