fix
Merge branch 'master' of github.com:imagecms/ImageCMS into template
Push orig Base
Push orig Bases
Merge branch 'template' of github.com:imagecms/ImageCMS into template
giftCert fixed;
Merge branch 'template' of github.com:imagecms/ImageCMS into template
custom fields in card fixed;
cffixed
Merge remote-tracking branch 'origin/template'