refs 6439 master merged

Conflicts:
	app/views/patrons/_form.html.erb
	config/locales/translation_en.yml
	config/locales/translation_ja.yml
	db/fixtures/system_configurations.yml