initial work on image gallery
Merge branch 'feature_gallery'