GalleryImage and Share user cleanup
Merge branch 'master' into gh-pages
MERGE: master