student controller and viewtestresult
Merge branch 'master' of https://github.com/hoangdd/7maru

Conflicts:
	app/Controller/StudentController.php
khac linh 5/3
update admincontroller
update admincontroller
update notification admin
ipmanage and test
remove conflict
Update model, sql, Login voi hoangdd/123 va admin/123
linhtinh
Merge branch 'master' of https://github.com/hoangdd/7maru
update fix loi
user manage
Merge branch 'master' of https://github.com/hoangdd/7maru
gui bac Hoang
Merge branch 'master' of https://github.com/hoangdd/7maru
update htaccess
Merge branch 'master' of https://github.com/hoangdd/7maru
Important changes
Update change Password