一時コミット
Merge branch 'master' of https://github.com/yada-ITA/csc into 09051

Conflicts:
	app/models/inquiry.rb
Merge branch 'master' of https://github.com/yada-ITA/csc into 09051

Conflicts:
	app/models/inquiry.rb
	app/views/inquiries/index.html.erb
Merge branch 'master' of https://github.com/yada-ITA/csc into 09051
Merge branch 'master' of https://github.com/yada-ITA/csc into 09051

Conflicts:
	app/models/inquiry.rb
tt
アップはしない
修正適用分です
Merge branch 'branch090601' of https://github.com/myama2630/csc into myama2630-branch090601

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