기본 구조 변경
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/menu.json
	partials/cms/signin.html