Merge origin/master

Conflicts:
	src/main/java/YogaStudio/dao/generic/FacultyDAO.java
	src/main/java/YogaStudio/service/AdvisorService.java
	src/main/webapp/WEB-INF/views/faculty/advisees.jsp
	src/main/webapp/WEB-INF/views/faculty/facultyschedule.jsp
	src/main/webapp/WEB-INF/views/faculty/facultysectionlist.jsp
	src/main/webapp/WEB-INF/views/home_nagivation.jsp
	src/main/webapp/WEB-INF/views/nagivation.jsp
	src/main/webapp/WEB-INF/views/waiver/viewWaiversByFA.jsp
Merge origin/master
Merge origin/master

Conflicts:
	src/main/java/YogaStudio/dao/generic/FacultyDAO.java
	src/main/java/YogaStudio/service/AdvisorService.java
	src/main/webapp/WEB-INF/views/faculty/advisees.jsp
	src/main/webapp/WEB-INF/views/faculty/facultyschedule.jsp
	src/main/webapp/WEB-INF/views/faculty/facultysectionlist.jsp
	src/main/webapp/WEB-INF/views/home_nagivation.jsp
	src/main/webapp/WEB-INF/views/nagivation.jsp
	src/main/webapp/WEB-INF/views/waiver/viewWaiversByFA.jsp
Merge origin/master

Conflicts:
	src/main/java/YogaStudio/dao/generic/FacultyDAO.java
	src/main/java/YogaStudio/service/AdvisorService.java
	src/main/webapp/WEB-INF/views/faculty/advisees.jsp
	src/main/webapp/WEB-INF/views/faculty/facultyschedule.jsp
	src/main/webapp/WEB-INF/views/faculty/facultysectionlist.jsp
	src/main/webapp/WEB-INF/views/home_nagivation.jsp
	src/main/webapp/WEB-INF/views/nagivation.jsp
	src/main/webapp/WEB-INF/views/waiver/viewWaiversByFA.jsp
Merge origin/master

Conflicts:
	src/main/java/YogaStudio/domain/SectionEntity.java