обновил
Merge branch 'master' of https://github.com/range-web/sport

Conflicts:
	public_html/frontend/protected/modules/gallery/views/default/index.php
обновил конфиг