front
Merge branch 'master' of github.com:imagecms/ImageCMS
fix
Merge branch 'master' of github.com:imagecms/ImageCMS into template