Photo viewer simplified
Merge branch 'dev'