Merge branch 'laura'

Conflicts:
	app/controllers/listings_controller.rb
	app/views/shared/_error_messages.html.erb
	app/views/shared/_listing_form.html.erb