Merge pull request #1796 from dotCMS/issue-1735-PhotoGalleryMacro-does-not-display-Subfolders-properly

fixes #1735