photo_view
Merge branch 'master' of github.com:stream-org/stream

Conflicts:
	channing/index.html