Photo viewer photo listing fix
Merge branch 'dev'