bugs fixes
conflict
Merge branch 'development' of github.com:imagecms/ImageCMS into development