u
Merge branch 'master' of https://github.com/webueye/speaker

Conflicts:
	src/main/java/com/speaker/controller/ReserveController.java
	src/main/java/com/speaker/entity/ScheduleItem.java
	src/main/java/com/speaker/service/ScheduleService.java
	src/main/webapp/WEB-INF/pages/member/reserve-confirm.jsp
	src/main/webapp/common/left.jsp