modified:   app/Config/core.php
	modified:   app/Controller/AppController.php
	modified:   app/Controller/CoursesController.php
	modified:   app/Controller/DashboardsController.php	modified:   app/Controller/UsersController.php
	modified:   app/View/Courses/guest_view.ctp
	modified:   app/View/Dashboards/home.ctp
	modified:   app/View/Elements/Menu/guest/nav.ctp
	modified:   app/View/Elements/Widgets/guest/news.ctp
	modified:   app/View/Elements/Widgets/guest/registering_courses.ctp
	modified:   app/Config/core.php
	modified:   app/Controller/AppController.php
	modified:   app/Controller/CoursesController.php
	modified:   app/Controller/DashboardsController.php
	new file:   app/Controller/MessagesController.php
	modified:   app/Controller/UsersController.php
	new file:   app/Model/Message.php
	modified:   app/View/Courses/guest_view.ctp
	modified:   app/View/Dashboards/home.ctp
	modified:   app/View/Elements/Menu/guest/nav.ctp
	renamed:    app/View/Elements/Widgets/guest/news.ctp -> app/View/Elements/Widgets/guest/khoa_sap_to_chuc.ctp
	modified:   app/View/Elements/Widgets/guest/news.ctp
	modified:   app/View/Elements/Widgets/guest/registering_courses.ctp
	modified:   app/View/Elements/Widgets/guest/today_schedule.ctp
	new file:   app/View/Messages/add.ctp
	new file:   app/View/Messages/edit.ctp
	new file:   app/View/Messages/index.ctp
	new file:   app/View/Messages/view.ctp
	new file:   app/View/Messages/xem_thong_bao.ctp
	modified:   nbproject/private/private.xml
Merge branch 'Toan'
Merge branch 'master' into Khoa

Conflicts:
	app/Controller/CoursesController.php
	nbproject/private/private.xml

	modified:   app/Config/core.php
	modified:   app/Controller/AppController.php
	modified:   app/Controller/CoursesController.php
	modified:   app/Controller/DashboardsController.php
	new file:   app/Controller/MessagesController.php
	modified:   app/Controller/UsersController.php
	new file:   app/Model/Message.php
	new file:   app/View/Courses/guest_view.ctp
	modified:   app/View/Dashboards/home.ctp
	modified:   app/View/Elements/Menu/guest/nav.ctp
	renamed:    app/View/Elements/Widgets/guest/news.ctp -> app/View/Elements/Widgets/guest/khoa_sap_to_chuc.ctp
	modified:   app/View/Elements/Widgets/guest/news.ctp
	modified:   app/View/Elements/Widgets/guest/registering_courses.ctp
	modified:   app/View/Elements/Widgets/guest/today_schedule.ctp
	new file:   app/View/Messages/add.ctp
	new file:   app/View/Messages/edit.ctp
	new file:   app/View/Messages/index.ctp
	new file:   app/View/Messages/view.ctp
	new file:   app/View/Messages/xem_thong_bao.ctp
	modified:   nbproject/private/private.xml
	modified:   app/Controller/CoursesController.php