last changes
Merge branch 'userstory71' of github.com:imagecms/ImageCMS into userstory71