commit news
detailmenuimage
Merge branch 'master' of https://github.com/thanhtuyen/vaco

Conflicts:
	protected/models/News.php
	protected/models/detailMenu.php
update model news, detailmenu