update
Merge branch 'master' of https://github.com/urielzen/Gallery.git