refs 6439 master merged

Conflicts:
	app/views/patrons/_form.html.erb
	db/fixtures/function_class_abilities.yml
	db/fixtures/functions.yml