mall다듬기
Merge branch 'master' of https://github.com/hukla/gaenari.git

Conflicts:
	WebContent/WEB-INF/actionMapping.properties