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