asdf
Merge branch 'master' of https://github.com/giapnh/T08_E-learning

Conflicts:
	Elearning/application/modules/default/controllers/UserController.php