modified:   app/Controller/AppController.php
	modified:   app/Controller/ChaptersController.php
	modified:   app/Controller/CoursesController.php
	modified:   app/Controller/DepartmentsController.php
	modified:   app/Controller/FieldsController.php
	modified:   app/Controller/GroupsController.php
	modified:   app/Controller/UsersController.php
	modified:   app/Model/Course.php
	modified:   app/Model/Field.php
	modified:   app/View/Chapters/fields_manager_index.ctp
	new file:   app/View/Chapters/manager_add.ctp
	new file:   app/View/Chapters/manager_edit.ctp
	new file:   app/View/Chapters/manager_index.ctp
	new file:   app/View/Chapters/manager_view.ctp
	modified:   app/View/Courses/fields_manager_index.ctp
	modified:   app/View/Courses/fields_manager_view.ctp
	new file:   app/View/Courses/manager_add.ctp
	new file:   app/View/Courses/manager_edit.ctp
	new file:   app/View/Courses/manager_index.ctp
	new file:   app/View/Courses/manager_view.ctp
	modified:   app/View/Dashboards/home.ctp
	deleted:    app/View/Departments/add.ctp
	deleted:    app/View/Departments/edit.ctp
	deleted:    app/View/Departments/index.ctp
	new file:   app/View/Departments/manager_add.ctp
	new file:   app/View/Departments/manager_edit.ctp
	new file:   app/View/Departments/manager_index.ctp
	renamed:    app/View/Departments/view.ctp -> app/View/Departments/manager_view.ctp
	modified:   app/View/Elements/Menu/admin/left_nav.ctp
	modified:   app/View/Elements/Menu/manager/header.ctp
	modified:   app/View/Elements/Menu/manager/left_menu.ctp
	modified:   app/View/Elements/Menu/manager/top_menu.ctp
	new file:   app/View/Fields/manager_add.ctp
	new file:   app/View/Fields/manager_index.ctp
	renamed:    app/View/Groups/add.ctp -> app/View/Groups/admin_add.ctp
	renamed:    app/View/Groups/edit.ctp -> app/View/Groups/admin_edit.ctp
	renamed:    app/View/Groups/index.ctp -> app/View/Groups/admin_index.ctp
	renamed:    app/View/Groups/view.ctp -> app/View/Groups/admin_view.ctp
	modified:   app/View/Layouts/manager.ctp
	modified:   app/View/Users/fields_manager_index.ctp
	deleted:    app/View/Users/login1.ctp
	new file:   app/View/Users/manager_add.ctp
	new file:   app/View/Users/manager_edit.ctp
	new file:   app/View/Users/manager_index.ctp
	new file:   app/View/Users/manager_search.ctp
	new file:   app/View/Users/manager_view.ctp
	modified:   app/webroot/js/AdminLTE/app.js
	modified:   nbproject/private/private.properties
	modified:   nbproject/private/private.xml

	app/View/Courses/manager_score.ctp
	app/webroot/files/attachment/attachment/124/
	app/webroot/files/chapter/image/8/
4h16 18/06/2014
11h 19/06/2014
10h48 ngay 23/06/2014
	new file:   nbproject/private/config.properties
	modified:   nbproject/private/private.properties
Merge branch 'Toan'

Conflicts:
	app/Controller/DepartmentsController.php
	app/Controller/UsersController.php
	app/Model/Course.php
	app/View/Courses/guest_view.ctp
	app/View/Dashboards/home.ctp
	app/View/Elements/Common/loggedInMenu.ctp
	app/View/Elements/Menu/fieldsManager/top_right_nav.ctp
	app/View/Elements/Menu/guest/header.ctp
	app/View/Elements/Menu/guest/nav.ctp
	app/View/Messages/index.ctp
	nbproject/private/private.properties
	nbproject/private/private.xml
1h29pm ngay 23/06/2014