defects#2[1] fixed;
Merge branch 'template' of github.com:imagecms/ImageCMS into template