Merge remote-tracking branch 'origin/DEMO2' into DEMO2

Conflicts:
	src/main/java/com/softserveinc/softtour/repository/TourRepository.java
	src/main/java/com/softserveinc/softtour/service/Impl/TourServiceImpl.java
	src/main/java/com/softserveinc/softtour/service/TourService.java
Merge remote-tracking branch 'origin/DEMO2' into DEMO2

Conflicts:
	src/main/java/com/softserveinc/softtour/repository/TourRepository.java
	src/main/java/com/softserveinc/softtour/service/Impl/TourServiceImpl.java
	src/main/java/com/softserveinc/softtour/service/TourService.java
Merge remote-tracking branch 'origin/DEMO2' into DEMO2
Merge remote-tracking branch 'origin/DEMO2' into DEMO2

Conflicts:
	src/main/java/com/softserveinc/softtour/repository/TourRepository.java
	src/main/java/com/softserveinc/softtour/service/Impl/TourServiceImpl.java
	src/main/java/com/softserveinc/softtour/service/TourService.java