SC14 so khai, chua can chinh va ve bang
Fix conflict
Fix Docs for Git
Fix conflict new
Fix thinhnv branch
Merge phan anh Thinh
New DataBase
Minor fix
New Layout CSS
Conflict
remove Permision
New Layout Full Test
Confict sida
Permision cai clgt
Merge branch 'master' of github.com:t02itjap/elearning
Fix conflict!
Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_elearning_list
	app/tmp/cache/models/myapp_cake_model_default_elearning_tb_users
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_cake_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log
Ignore tmp file
Minor fix
Eclipse project option
Fix conflict Master
Minor fix font