dummy view has the photo viewer
nada
Merge remote-tracking branch 'origin/master'
photos grid in the tableview
merge