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

Conflicts:
	advanced/frontend/protected/modules/site/views/default/contact.php
	advanced/frontend/protected/modules/site/views/default/provision.php
	public_html/frontend/protected/modules/site/views/layouts/main.php
Merge branch 'master' of https://github.com/range-web/sport

Conflicts:
	public_html/common/config/params.php