1205 김진영 Scheduler 작업중 (scheduler 부분)
Merge branch 'jin01'

준영 BaseTag 충돌 수정

Conflicts:
	NPE/src/main/webapp/WEB-INF/views/main.jsp
	NPE/src/main/webapp/WEB-INF/views/scheduler.jsp