ok
Merge https://github.com/kupol/edupro

Conflicts:
	edupro/application/controllers/listusers.php
Merge https://github.com/kupol/edupro
ok
Merge https://github.com/kupol/edupro
ok
Conflicts:
	edupro/application/controllers/listusers.php
Merge https://github.com/kupol/edupro
ok
ok
Merge https://github.com/kupol/edupro
ok
Conflicts:
	edupro/application/controllers/listusers.php
Merge https://github.com/kupol/edupro

Conflicts:
	edupro/application/controllers/listusers.php
Merge https://github.com/kupol/edupro
err
Merge https://github.com/kupol/edupro
Merge https://github.com/kupol/edupro
Merge https://github.com/kupol/edupro
Merge https://github.com/kupol/edupro
i
Merge https://github.com/kupol/edupro
as:
Conflicts:
	edupro/application/controllers/listusers.php
remove echo 'OK';