refs6538 検索結果の著者ラベルの重複表示を修正
refs 6299 Title (manifestation can have some titles)
add title_types fixture
refs 6412 different label and column with PatronType
modified patron label translation
refs 6054 Approval

Manifestation has an approval
tomcat用の設定ファイルを追加。
Merge branch 'master' of https://github.com/MiraitSystems/enju_trunk
refs 6339 検索結果の出力から、出力ボタンを押すとエラーになる

delayed_job 実行時のリダイレクトURLを変更。
ファンクションキーの制御規制を修正
refs 6046 masterをマージ
Merge remote-tracking branch 'origin/master' into issue6046

Conflicts:
	app/models/manifestation.rb
	app/views/manifestations/_form.html.erb
	app/views/manifestations/_show_detail_librarian.html.erb
	app/views/page/configuration.html.erb
	config/locales/translation_en.yml
	config/locales/translation_ja.yml
	config/routes.rb