Merge pull request #5 from Luobata/master

商品详情页面，forum修改（后台 前台 搜索栏）
no message
Merge branch 'master' of https://github.com/Nicexm/BaoKuWang

Conflicts:
	catalog/controller/common/home.php
	catalog/view/javascript/baoku/index.js
4：44