Merge branch 'master' into laura

Conflicts:
	app/views/shared/_listing_form.html.erb