现货及旺铺
Merge branch 'master' of https://github.com/ycaihappy/mu

Conflicts:
	code/webroot/protected/config/main.php
	code/webroot/protected/modules/uehome/controllers/UserController.php
旺铺样式修改