Merge branch 'ua-aveselov' of https://github.com/pMatvienko/test into ua-pmatvienko

Conflicts:
	application/configs/system/resources.yml
	application/modules/admin/controllers/IndexController.php
	library/Core/Controller/Action/Scaffold.php