refactor
Merge remote-tracking branch 'origin/offering_demo' into offering_demo

Conflicts:
	src/main/java/com/softserveinc/softtour/controller/IndexController.java
add ru-ua departure city properties
Merge remote-tracking branch 'origin/offering_demo' into offering_demo