Conflicts:
	app/models/abbreviation.rb
	app/views/abbreviations/edit.html.erb
	app/views/abbreviations/index.html.erb
	app/views/abbreviations/new.html.erb
	config/locales/translation_en.yml
	config/locales/translation_ja.yml
refs 6055 利用許諾機能

issue6044で残っていたAppricationControllerの不要なメソッドの削除
master merged

Conflicts:
	app/views/abbreviations/index.html.erb