Feature : PhotoGallery
Merge remote-tracking branch 'origin/hotfix'