clean
c
c
Merge branch 'develop' of https://github.com/AndriySV/Copy into develop

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	pom.xml
	src/main/java/com/softserveinc/softtour/entity/Country.java
	src/main/java/com/softserveinc/softtour/entity/Favorite.java
	src/main/java/com/softserveinc/softtour/entity/Feedback.java
	src/main/java/com/softserveinc/softtour/entity/HistoryRecord.java
	src/main/java/com/softserveinc/softtour/entity/HistoryRequest.java
	src/main/java/com/softserveinc/softtour/entity/Hotel.java
	src/main/java/com/softserveinc/softtour/entity/Region.java
	src/main/java/com/softserveinc/softtour/entity/Role.java
	src/main/java/com/softserveinc/softtour/entity/Tour.java
	src/main/java/com/softserveinc/softtour/entity/User.java
	src/main/java/com/softserveinc/softtour/entity/template/Sex.java
	src/main/java/com/softserveinc/softtour/service/CountryService.java
	src/main/java/com/softserveinc/softtour/service/FavoriteService.java
	src/main/java/com/softserveinc/softtour/service/FeedbackService.java
	src/main/java/com/softserveinc/softtour/service/HistoryRequestService.java
	src/main/java/com/softserveinc/softtour/service/HotelService.java
	src/main/java/com/softserveinc/softtour/service/Impl/CountryServiceImpl.java
	src/main/java/com/softserveinc/softtour/service/Impl/FavoriteServiceImpl.java
	src/main/java/com/softserveinc/softtour/service/Impl/FeedbackServiceImpl.java
	src/main/java/com/softserveinc/softtour/service/Impl/HistoryRequestServiceImpl.java
	src/main/java/com/softserveinc/softtour/service/Impl/HotelServiceImpl.java
	src/main/java/com/softserveinc/softtour/service/Impl/RegionServiceImpl.java
	src/main/java/com/softserveinc/softtour/service/Impl/RoleServiceImpl.java
	src/main/java/com/softserveinc/softtour/service/Impl/TourServiceImpl.java
	src/main/java/com/softserveinc/softtour/service/Impl/UserServiceImpl.java
	src/main/java/com/softserveinc/softtour/service/RegionService.java
	src/main/java/com/softserveinc/softtour/service/RoleService.java
	src/main/java/com/softserveinc/softtour/service/TourService.java
	src/main/java/com/softserveinc/softtour/service/UserService.java
	src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
	src/main/webapp/WEB-INF/pages/test.jsp
	src/main/webapp/WEB-INF/web.xml