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

Conflicts:
	protected/views/home/detailMenu/list.php
	protected/views/home/news/list.php
Merge branch 'master' of https://github.com/thanhtuyen/vaco