旺铺主页设置
Merge branch 'master' of https://github.com/ycaihappy/mu

Conflicts:
	code/webroot/js/global.js
	code/webroot/themes/classic/views/layouts/user_main.php
	code/webroot/themes/classic/views/uehome/user/templateSetting.php
旺铺模板