refs 6412 master merged

Conflicts:
	app/controllers/patrons_controller.rb
	app/helpers/patrons_helper.rb
	app/models/item.rb
	app/views/patrons/_index_patron.html.erb