merge;
Merge remote-tracking branch 'origin/template'
front
Merge remote-tracking branch 'origin/master'
front
Merge branch 'master' of github.com:imagecms/ImageCMS
front
Merge branch 'template' of github.com:imagecms/ImageCMS into template
Merge branch 'master' of github.com:imagecms/ImageCMS into template
comparelist and wishlist head lines;