conflicts merges;
Merge branch 'master' of github.com:imagecms/ImageCMS