Merge origin/master
samuel enrollment ,unenrollment, manage semester, manage class
samuel enrollment ,unenrollment, manage semester, manage class
samuel enrollment ,unenrollment, manage semester, manage class
samuel enrollment ,unenrollment, manage semester, manage class
Merge origin/master

Conflicts:
	src/main/java/YogaStudio/dao/generic/CustomerDAO.java
	src/main/java/YogaStudio/dao/generic/SectionDAO.java
	src/main/java/YogaStudio/dao/generic/SemesterDAO.java
	src/main/java/YogaStudio/domain/CustomerEntity.java
	src/main/java/YogaStudio/domain/SectionEntity.java
	src/main/java/YogaStudio/service/CustomerService.java
	src/main/java/YogaStudio/service/SemesterService.java
	src/main/java/YogaStudio/service/UserService.java
	src/main/webapp/WEB-INF/rootconfig.xml
	src/main/webapp/WEB-INF/views/classes/classDetail.jsp
	src/main/webapp/WEB-INF/views/section/editSection.jsp
	src/main/webapp/WEB-INF/views/section/semesterPop.jsp
	src/main/webapp/WEB-INF/views/waiver/requestWaiver.jsp