修改首页链接
给商城页添加更多
Merge branch 'master' of https://github.com/GavinLai/zhufuyu
Merge branch 'master' of https://github.com/GavinLai/zhufuyu

Conflicts:
	modules/default/tpl/mod_default_index.htm.php
	modules/mall/tpl/mod_mall_index.htm.php