Sua may file phia duoi, chua confirm voi anh Hoan
Merge branch 'master' of github.com:t02itjap/elearning
Merge from hoanln Okie.
Bug Request Action fixed!
new DataBase!

Conflicts:
	app/Controller/AppController.php
	app/View/Elements/category.ctp