edit, created, deleted admins
Merge remote-tracking branch 'origin/ua-aveselov' into ua-dsemik

Conflicts:
	library/Core/Controller/Action/Scaffold.php
Merge branch 'ua-pmatvienko' of https://github.com/pMatvienko/test into ua-dsemik

Conflicts:
	application/configs/system/database.yml
Merge branch 'ua-pmatvienko' of https://github.com/pMatvienko/test into ua-dsemik

Conflicts:
	application/configs/system/database.yml
Merge branch 'ua-pmatvienko' of https://github.com/pMatvienko/test into ua-dsemik

Conflicts:
	application/configs/system/database.yml