Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

# Conflicts:
#	template/m.yohobuy.com/actions/index/home/i-help.phtml
#	yohobuy/m.yohobuy.com/application/controllers/Home.php

@@ -876,7 +876,7 @@ class HomeController extends AbstractAction
     */
     */
     public function helpAction()
     public function helpAction()
     {   
     {   
-        $service = Home\HelpModel::serviceInfo(); 
+        $service = Home\HelpModel::serviceInfo();
         $this->setTitle('帮助中心');
         $this->setTitle('帮助中心');
         $this->setNavHeader('帮助中心');
         $this->setNavHeader('帮助中心');
         $data = array(
         $data = array(