update photos and spots

dfdsfdsfdsf
Merge remote-tracking branch 'origin/master'