layout all
Merge branch 'master' of https://github.com/thanhtuyen/vaco

Conflicts:
	protected/controllers/admin/DetailMenuController.php
	protected/models/detailMenu.php
	protected/views/admin/detailMenu/view.php