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