rem: no working sysytem
Merge https://github.com/kupol/edupro
Merge https://github.com/kupol/edupro
Merge https://github.com/kupol/edupro
Merge https://github.com/kupol/edupro
Merge https://github.com/kupol/edupro
Merge https://github.com/kupol/edupro
rem: conflict
Conflicts:
	edupro/application/views/main_page.php