do merge develop to test cart feature

@@ -28,5 +28,18 @@
         s.parentNode.insertBefore(hm, s);
         s.parentNode.insertBefore(hm, s);
     })();
     })();
 </script>
 </script>
+<script>
+    window._py = window._py||[];
+    window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
+    window._py.push(['domain','stats.ipinyou.com']);
+    if(typeof _goodsData!='undefined')
+    window._py.push(['pi',_goodsData]);
+    window._py.push(['e','']);
+    function(d){
+        var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
+        c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
+        var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
+    }(document);
+</script>
 <script src="http://static.yohobuy.com/js/analytics/analysis.js" async="async"></script>
 <script src="http://static.yohobuy.com/js/analytics/analysis.js" async="async"></script>
 <script src="http://static.yohobuy.com/m/v1/js/om_code.js" async="async"></script>
 <script src="http://static.yohobuy.com/m/v1/js/om_code.js" async="async"></script>

@@ -18,8 +18,8 @@
 {{#if devEnv}}
 {{#if devEnv}}
 <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
 <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
 <script>seajs.config({base: 'http://localhost:8000/'});</script>
 <script>seajs.config({base: 'http://localhost:8000/'});</script>
-{{/if}}
-        {{> layout/use}}
+{{/if}} 
+{{> layout/use}} 
 {{> layout/analysis}} 
 {{> layout/analysis}} 
 </body>
 </body>
 </html>
 </html>