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

Conflicts:
	application/modules/admin/controllers/ApiController.php
	application/modules/admin/controllers/IndexController.php
	application/modules/admin/views/templates/index/index.tpl