various changes
Merge branch 'master' of https://github.com/antolikjan/mozaik-contrib
various minor changes