housing編集開始
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into housing

Conflicts:
	config/routes.rb
	db/schema.rb
	spec/models/reason_spec.rb
住宅手当申請書完成（仮）
Merge remote-tracking branch 'origin/housing'

Conflicts:
	app/views/layouts/_header.html.slim
	db/schema.rb