Merge branch 'picture-styling'

Conflicts:
	app/views/shared/_listing_form.html.erb
	app/views/users/_index_part.html.erb
	app/views/users/_show_part.html.erb