popup and other cart fixed;
Merge remote-tracking branch 'origin/template'
fix
Merge branch 'master' of github.com:imagecms/ImageCMS into template