表示の日本語化
Merge branch 'branch2' of https://github.com/7016fuji/csc into 7016fuji-branch2

Conflicts:
	app/views/inquiries/show.html.erb