1.генерация табов
2.внесены роуты
3.индекс
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/ug-tours/views/home/index.php
	themes/ug-tours/views/layouts/application.php