Первый комит
Внедрение старого авто-аплоадера
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 remote-tracking branch 'origin/ua-pmatvienko' into ua-dsemik
marge
marge
Merge branch 'ua-pmatvienko' of https://github.com/pMatvienko/test into ua-aveselov
marge
marge
Merge branch 'ua-pmatvienko' of https://github.com/pMatvienko/test into ua-aveselov
Merge branch 'ua-pmatvienko' of https://github.com/pMatvienko/test into ua-aveselov
Merge branch 'ua-pmatvienko' of https://github.com/pMatvienko/test into ua-dsemik

Conflicts:
	application/configs/system/database.yml
search for grid (doctrine)
sort for grid (doctrine)
Merge branch 'ua-pmatvienko' of https://github.com/pMatvienko/test into ua-dsemik

Conflicts:
	application/configs/system/database.yml
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
sort for grid (doctrine)
Merge branch 'ua-pmatvienko' of https://github.com/pMatvienko/test into ua-dsemik

Conflicts:
	application/configs/system/database.yml