before branch change
Merge branch 'webinger' of github.com:imagecms/ImageCMS into webinger