Merge branch 'master' of github.com:imagecms/ImageCMS into development
Merge branch 'development' of github.com:imagecms/ImageCMS into development
catalogue header
Merge branch 'development' of github.com:imagecms/ImageCMS into development