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

Conflicts:
	advanced/backend/controllers/ServiceController.php
Merge branch 'master' of https://github.com/range-web/pirozhki-client
Merge branch 'master' of https://github.com/range-web/pirozhki-client
Обновил
Merge branch 'master' of https://github.com/range-web/pirozhki-client