Hoan chinh ver1 Fee History
Xoa bo may dau khong can thiet!
Merge branch 'master' of github.com:t02itjap/elearning
add LessonOfCategory Model
Merge branch 'master' of github.com:t02itjap/elearning
Add screen 37
Merge branch 'master' of github.com:t02itjap/elearning
Refactor Admins Controller.
Conflicts:
	app/Controller/AdminsController.php
Merge branch 'thangvm' of github.com:t02itjap/elearning into thangvm
Merge branch 'thangvm'
Merge phan anh THang vao code.
Conflicts:
	app/Controller/StudentsController.php
	app/Controller/TeachersController.php
	app/View/Students/get_histories.ctp
	app/View/Users/register.ctp
Japanese comment code