Merge origin/master

Conflicts:
	src/main/java/YogaStudio/dao/generic/SectionDAO.java
	src/main/java/YogaStudio/service/UserService.java
Merge origin/master

Conflicts:
	src/main/java/YogaStudio/dao/generic/SectionDAO.java
	src/main/java/YogaStudio/service/UserService.java
Merge origin/master

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