Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/views/nagivation.jsp
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/views/nagivation.jsp
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/views/nagivation.jsp
Merge origin/master

Conflicts:
	src/main/java/YogaStudio/domain/SectionEntity.java
	src/main/webapp/WEB-INF/views/faculty/navi.jsp
	src/main/webapp/WEB-INF/views/home_nagivation.jsp
	src/main/webapp/WEB-INF/views/index.jsp
	src/main/webapp/WEB-INF/views/nagivation.jsp
	src/main/webapp/WEB-INF/views/user/editProfile.jsp
	src/main/webapp/WEB-INF/views/user/register_form.jsp
	src/main/webapp/WEB-INF/views/waiver/viewWaiversByFA.jsp