tao violation
dem so lan vi pham
sua confilt
Merge tha and xuanminh Branch
loc added
Test Multiupload
Merge thanhbq branch
Merge Loc3 branch
Search student
Upload files
Merge branch 'master' of https://github.com/anhlt/elearning into thanhbq

Conflicts:
	Controller/DocumentController.php
	Controller/LecturerController.php
	Controller/LessonController.php
	Model/Admin.php
	Model/LessonMembership.php
	View/Document/add.ctp
	tmp/cache/models/www_cake_model_default_elearning_list
	tmp/cache/persistent/www_cake_core_file_map
	tmp/cache/persistent/www_cake_core_method_cache
	tmp/cache/persistent/www_cake_core_object_map
	tmp/logs/error.log
	webroot/index.php