Merge origin/master

Conflicts:
	src/main/java/YogaStudio/service/UserService.java