旺铺的菜单选择
Merge branch 'master' of https://github.com/ycaihappy/mu

Conflicts:
	code/webroot/protected/modules/storeFront/widgets/default/FrontHeader.php