modified:   nbproject/private/private.xml
Merge branch 'Toan' into Khoa
ngày 23/06/2014, gio: 11
1h29pm ngay 23/06/2014
Merge branch 'Khoa'

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.xml
8h52 1/7/2014
1h27 2/7/2014
Merge branch 'Toan'

Conflicts:
	app/Controller/AppController.php

	modified:   app/Controller/AppController.php
	modified:   app/Controller/AppController.php