front
Merge branch 'master' of github.com:imagecms/ImageCMS
fix some modules
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/template'
Merge remote-tracking branch 'origin/template'
variant import start