Modify!
Merge branch 'master' of github.com:t02itjap/elearning
Merge branch 'master' of github.com:t02itjap/elearning
Full Phi test
Merge branch 'thinhnv'
copy lai mot vai cai
Merge branch 'tiendq'
them block student
Conflicts:
	app/Controller/TeachersController.php
	app/Controller/UsersController.php
	app/Model/BannedStudent.php
	app/Model/User.php
	app/View/Layouts/teacher.ctp
	app/View/Teachers/summary.ctp
Co chinh cai eo gi dau.
New link for Elearning.
Update Like Button
Fix StudentController conflict