no message
Merge branch 'master' of https://github.com/Nicexm/BaoKuWang

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