Merge branch 'master' of github.com:imagecms/ImageCMS into template
variant import start
fixes;
merge;
Merge branch 'template' of github.com:imagecms/ImageCMS into template
variant import fin
variant import fin
fix
search
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Merge remote-tracking branch 'origin/template'
Merge remote-tracking branch 'origin/master'