shop commit, nothing changed in base
Merge branch 'userstory83' of github.com:imagecms/ImageCMS into userstory83