штащ
Merge branch 'master' of https://github.com/range-web/pirozhki-client

Conflicts:
	advanced/frontend/controllers/SiteController.php
info