Js photogallery, bug fixes
Merge branch 'release/2.3'