comments (not fin) ninja merge fix
Merge branch 'template' of github.com:imagecms/ImageCMS into template