首页现货BUG
Merge branch 'master' of https://github.com/ycaihappy/mu

Conflicts:
	code/webroot/protected/widgets/views/index_product.php