refs 6116 master merged

Conflicts:
	app/controllers/manifestations_controller.rb
	app/controllers/orders_controller.rb
	app/models/manifestation.rb
	app/views/page/configuration.html.erb
	app/views/patrons/_form.html.erb
	config/locales/translation_en.yml
	config/locales/translation_ja.yml
	config/routes.rb
	db/fixtures/function_class_abilities.yml
	db/fixtures/functions.yml
	db/fixtures/system_configurations.yml