sas
showpage
Merge branch 'master' into showpage2.0

Conflicts:
	app/views/photo/main.erb
	app/views/photo/new.erb