지방별 사전등록 완료+a
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/3000_contents/3100_enter/resort_B.html
	app/views/3000_contents/3100_enter/resort_C.html