20140901 1913
달력 추가중
20140902 1043
일단 커밋
효 comp
Merge remote-tracking branch 'origin/JungEun_140901' into ja

Conflicts:
	HACO_System/src/main/java/kr/co/haco/Controller/ManagementController.java
	HACO_System/src/main/webapp/WEB-INF/views/management/index.jsp
	HACO_System/src/main/webapp/resources/gazONojfL3/css/styles.css