Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop

Conflicts:
	partials/layout/footer.html

-<li class="clearfix">
-    <div class="userimg">
-        <img src="\{{userimg}}" alt="">
-        <i class="\{{partnerType}}"></i>
-    </div>
-    <div class="userinfo">
-        <h6>{{username}}</h6> 
-        <p class="comment-text">{{content}}</p>
-        {{# isSelf}}
-        <a class="delete-comment" href="javascript:;" pid="{{id}}"></a>
-        {{/ isSelf}} 
-    </div>
-</li>

 <script id="comment-tpl" type="x-tmpl-mustache">
     <ul class="comments-list">
         \{{# comment}}
-        {{> common/comment_list}}
+        <li class="clearfix">
+            <div class="userimg">
+                <img src="\{{userimg}}" alt="">
+                <i class="\{{partnerType}}"></i>
+            </div>
+            <div class="userinfo">
+                <h6>\{{username}}</h6> 
+                <p class="comment-text">\{{content}}</p>
+                \{{# isSelf}}
+                <a class="delete-comment" href="javascript:;" pid="{{id}}"></a>
+                \{{/ isSelf}} 
+            </div>
+        </li>
         \{{/ comment}}
     </ul>
     \{{# more}}
     <div class="view-more"><a href="javascript:;">View&nbsp;<span>\{{moreNum}}</span>&nbsp;more</a></div>
     \{{/ more}}
     \{{# page}}
-    <div class="pager-content comment-pager-content">
-        <div class="channel-index-pager">\{{commentPage}}</div>
+    <div class="comment-pager-content pager-content-default" style="display:none">
+        <div class="channel-index-pager">\{{> html}}</div>
     </div>
     \{{/ page}}
     <div class="comment-textarea">

@@ -42,5 +42,4 @@
     </body>
     <script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
     {{> common/script}}
-
 </html>
\ No newline at end of file

 <div class="mags-column">
     <h2>E&nbsp;-&nbsp;ZINE</h2>
     <div class="column-slide e-zine">
+        <h4>YOHO!GIRL</h4>
         <div class="slide-box">
             <img class="loading-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/loading.gif" alt=" ">
         </div>