Merge branch 'master' of ssh://pege77@mercury.wipsl.com/var/git/irreco-theme-editor