Merge origin/master

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

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

Conflicts:
	src/main/java/YogaStudio/Controller/FacultyController.java
	src/main/webapp/resources/public/js/common.js
Merge origin/master

Conflicts:
	src/main/java/YogaStudio/Controller/FacultyController.java
	src/main/webapp/resources/public/js/common.js
Merge origin/master

Conflicts:
	src/main/java/YogaStudio/Controller/FacultyController.java
	src/main/webapp/resources/public/js/common.js