Serve photos and thumbnails, ready to create photo thumbnails
Merge remote-tracking branch 'origin/master'