scaffold
scaffold
scaffold
scaffold
Added zfdatagrid (http://code.google.com/p/zfdatagrid/wiki/Start?tm=6)
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
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
fix scaffold
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
Merge branch 'ua-aveselov' of https://github.com/pMatvienko/test into ua-pmatvienko
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
edit, created admins
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
aa
Merge remote-tracking branch 'origin/ua-pmatvienko' into ua-dsemik
Merge branch 'ua-pmatvienko' of https://github.com/pMatvienko/test into ua-dsemik

Conflicts:
	application/configs/system/database.yml