abc
Merge branch 'master' of https://github.com/anhntk54/giaingoaihang
category/view.php
Merge branch 'master' of https://github.com/anhntk54/giaingoaihang

Conflicts:
	protected/modules/Home/views/default/index.php
	protected/runtime/application.log