fix
Merge branch 'master' of github.com:imagecms/ImageCMS into userstory83
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83