edit tempalate
Merge branch 'master' of https://github.com/thanhtuyen/vaco

Conflicts:
	protected/views/admin/detailMenu/admin.php
	protected/views/admin/menu/admin.php
	protected/views/admin/news/admin.php
	protected/views/admin/user/admin.php