code after fix category model
Merge branch 'master' of https://github.com/t02itjap/elearning
"Chua sua conflict!"

Conflicts:
	app/Controller/AppController.php