morecss
Merge branch 'master' into headerbar

Conflicts:
	app/views/photo/main.erb
	app/views/user/signup.erb