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