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
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