공지사항 관련 수정
Merge branch 'master' of github.com:wrjeoung/haksa

Conflicts:
	WebContent/WEB-INF/springController-servlet.xml