refs6414 図書著名目録のSQL不正を修正
refs 6342 modified send message
refs 6054 Approval

Approval CRUD
refs 6054 Approval

Approval CRUD
refs 5949 Use patron_relationship_type facet
refs 6005 patron_merge_list 表示画面の修正

統合時に、選んだPatronが残り、その他のPatronは消される旨の注意書きを追加した。
Merge remote-tracking branch 'origin/master' into issue6299
Merge branch 'master' of https://github.com/MiraitSystems/enju_trunk
refs 6044 Create Abbreviation

Abbreviation CRUD
get_abbreviation method to create title abbreviation
Merge branch 'master' of https://github.com/MiraitSystems/enju_trunk
refs 6055 UseLicense CRUD
refs 6299 work_has_titlesテーブル作成
Merge remote-tracking branch 'origin/master' into issue6299

Conflicts:
	app/models/ability.rb
	config/locales/translation_en.yml
	config/locales/translation_ja.yml
	config/routes.rb