резултьтаты_поиска_справа
test
Merge branch 'master' of https://github.com/shimovolos/Hotels

Conflicts:
	protected/config/main.php
	protected/controllers/SiteController.php