Merge branch 'master' of github.com:imagecms/ImageCMS into template
fixes;
merge;
Merge branch 'template' of github.com:imagecms/ImageCMS into template