fix layout, add admins teachers controller, fix students controller
Login
Chuc nang man hinh SC01-SC5-6-16-17-39-40
merge hoanl's functions
Do some things
Merge branch 'master' of https://github.com/t02itjap/elearning
Pull master to tiendq branch
Conflicts:
	app/Controller/UsersController.php
Merge branch 'tiendq'
Fix!
Conflicts:
	app/Controller/UsersController.php
Upload  toan bo
Merge branch 'master' of github.com:t02itjap/elearning
Okie conflict fixed!

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	app/Controller/TeachersController.php
Merge branch 'khanhnd'

Fixed.
Category.ctp & acc_info.ctp chua thong nhat, doi anh Hoan de sua.

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	app/Controller/AdminsController.php
	app/Controller/AppController.php
	app/Controller/StudentController.php
	app/Controller/StudentsController.php
	app/Controller/TeachersController.php
	app/Controller/UsersController.php
	app/Model/IpAddress.php
	app/View/Admins/register_new_manager.ctp
	app/View/Elements/acc_info.ctp
	app/View/Elements/category.ctp
	app/View/Students/change_info.ctp
	app/View/Teachers/change_info.ctp
	app/View/Users/register.ctp
code after fix category model
Merge branch 'master' of https://github.com/t02itjap/elearning
"Chua sua conflict!"

Conflicts:
	app/Controller/AppController.php
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
New database!
Add new DataBase!
new DataBase 006
Full View Documents, Test
Merge branch 'master' of github.com:t02itjap/elearning
Fix conflict!
Full Test.
Full Document View!
Conflicts:
	app/Controller/TestsController.php
	app/Model/Test.php
Teacher Create Juugyou