10h48 ngay 23/06/2014
Merge branch 'Khoa'
	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
3hpm ngay 26/06/2014
1h30 ngay 2/7/2014
Merge branch 'master' of https://github.com/TLC-APP/tms

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml

	modified:   app/Config/core.php
	modified:   app/Controller/AppController.php
	modified:   app/Plugin/AclManager/View/Acl/permissions.ctp
	new file:   ml0wbumm.gz5.txt
	modified:   nbproject/private/private.properties
	modified:   nbproject/private/private.xml
Merge branch 'master' into Toan

Conflicts:
	app/Controller/AppController.php
	app/Controller/CoursesController.php
	app/Controller/MessagesController.php
	app/Controller/UsersController.php
	app/Model/Chapter.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/Elements/Menu/manager/left_menu.ctp
	app/View/Messages/manager_add.ctp
	app/View/Messages/manager_edit.ctp
	app/View/Messages/manager_index.ctp
	nbproject/private/private.properties
	nbproject/private/private.xml