change photostream.html
merge photostream.html