로그작성 수정 및 공지사항 메뉴 작성
Merge remote-tracking branch 'origin/pde_projectMain2'

Conflicts:
	ProgManager/WebContent/WEB-INF/view/successView.jsp