second attempt at changes to photo album view
Merge branch 'master' into 122-dog-photos-slider