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

Conflicts:
	public_html/common/modules/gallery/models/search/PhotoSearch.php
Merge branch 'master' of https://github.com/range-web/sport
обновил
Merge branch 'master' of https://github.com/range-web/sport

Conflicts:
	public_html/common/modules/gallery/models/search/PhotoSearch.php