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

Conflicts:
	res/css/index.css

@@ -618,7 +618,7 @@ seajs.config({
 		'jquery': 'lib/jquery',
 		'zepto': 'lib/zepto'
 	},
-	//base: '../../res/js/',
-	base: YohoConfig.resUrl + 'js/',
+	base: '../../res/js/',
+	//base: YohoConfig.resUrl + 'js/',
 	charset: 'utf-8'
 });
\ No newline at end of file

@@ -19,7 +19,7 @@
                  <?php endforeach;?>
             </div>
             <div class="content">
-                <p><?php echo $title;?></p>
+                <p><?php echo Lib_Helper_Emoji::convert_view($title);?></p>
                 <p class="time"><?php echo date('Y.m.d', $fragment['publishTime'])?></p>
             </div>
         </div>

@@ -18,7 +18,7 @@
                     <?php endforeach;?>
                 </div>
                 <div class="content">
-                    <p><?php echo Lib_Utils_StringHelper::stripTags($fragment['content']);?></p>
+                    <p><?php echo Lib_Helper_Emoji::convert_view(Lib_Utils_StringHelper::stripTags($fragment['content']));?></p>
                     <p class="time"><?php echo date('Y.m.d', $fragment['publishTime'])?></p>
                 </div>
             </div>

@@ -17,7 +17,7 @@ $width = 308;
 ?>
 <div class="<?php !isset($video) ?'fluid-item':'';?>layout-item tiled">
      <div class="image-box">
-         <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" target="_blank" title="<?php echo $news['title'];?>" 
+         <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" target="_blank" title="<?php echo Lib_Utils_StringHelper::stripTags($news['title']);?>" 
             <?php echo $video !=1 ? sprintf("style=\"height:%spx;width:%spx;overflow: hidden;\"", $height, $width):''; ?>>
              <img src="<?php echo $thumb;?>" alt=""  <?php echo $video !=1 ? sprintf("style=\"height:%spx;width:%spx;\"", $height, $width):''; ?>>
              <?php if(trim($news['tag']) == '视频'):?>

@@ -21,7 +21,7 @@ else
 ?>
 <div class="layout-item tiled">
     <div class="image-box">
-        <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" title="<?php echo $news['title'];?>">
+        <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" title="<?php echo Lib_Utils_StringHelper::stripTags($news['title']);?>">
              <img src="<?php echo $thumb;?>" alt="" style="">
              <?php if(trim($news['tag']) == '视频'):?>
                 <i class="play-icon"></i>