0808
0808
0000
출석완료
Merge remote-tracking branch 'origin/JangHyeon' into hodong

Conflicts:
	HACO_System/src/main/java/kr/co/haco/Controller/ManagementController.java
	HACO_System/src/main/java/kr/co/haco/DAO/AccountDAO.java
	HACO_System/src/main/java/kr/co/haco/Mybatis/sqlmapper/Acount.xml
	HACO_System/src/main/java/kr/co/haco/Service/AccountService.java
	HACO_System/src/main/java/kr/co/haco/Service/AccountServiceImpl.java
	HACO_System/src/main/java/kr/co/haco/VO/Member.java
Merge remote-tracking branch 'origin/gugu'

Conflicts:
	HACO_System/src/main/java/kr/co/haco/Controller/HomepageController.java
	HACO_System/src/main/java/kr/co/haco/Controller/ManagementController.java
	HACO_System/src/main/java/kr/co/haco/VO/CenterClassroom.java
	HACO_System/src/main/java/kr/co/haco/VO/EducationCenter.java
	HACO_System/src/main/java/kr/co/haco/VO/OpenCourse.java
	HACO_System/src/main/java/kr/co/haco/VO/Subject.java
	HACO_System/src/main/resources/log4j.xml
	HACO_System/src/main/webapp/WEB-INF/views/homepage/inc/mypageAside.jsp
	HACO_System/src/main/webapp/WEB-INF/views/management/lectureRegister.jsp
	HACO_System/src/main/webapp/WEB-INF/web.xml