Task, Test, структура БД
Merge branch 'master' of https://github.com/dimavt/IT-University

Conflicts:
	cmp_system/Base/Base.php