Merge origin/master

Conflicts:
	src/main/java/YogaStudio/dao/generic/FacultyDAO.java