Updated UserService
Conflicts:
	src/main/java/com/softserveinc/softtour/service/Impl/UserServiceImpl.java
Updated UserRepository
Conflicts:
	src/main/java/com/softserveinc/softtour/repository/UserRepository.java