Merge "Refactoring the photoviewer." into jb-ub-mail