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

Conflicts:
	template/m.yohobuy.com/actions/product/detail/index.phtml

@@ -12,9 +12,9 @@
                 {{# is_discount}}
                     <p class="good-tag sale-tag">SALE</p>
                 {{/ is_discount}}
-                {{# is_yohoood}}
-                    <p class="good-tag yohood-tag">新品节</p>
-                {{/ is_yohoood}}
+                {{# is_yohood}}
+                    <div class="good-tag yohood-tag">新品节</div>
+                {{/ is_yohood}}
                 {{# is_limited}}
                     <p class="good-tag limit-tag">限量商品</p>
                 {{/ is_limited}}