Merge branch 'master' into release/5.4

@@ -231,7 +231,7 @@ function reMarginFooter(fixedElement) {
     a.src = j;
     m.parentNode.insertBefore(a, m);
 })(window, document, 'script', ('https:' === document.location.protocol ? 'https' : 'http') + '://' +
-    'cdn.yoho.cn/yas-jssdk/2.1.1/yas.js', '_yas');
+    'cdn.yoho.cn/yas-jssdk/2.1.2/yas.js', '_yas');
 
 (function() {
     var uid = getUid(),
@@ -245,7 +245,7 @@ function reMarginFooter(fixedElement) {
     window._ozuid = uid; // 暴露ozuid
 
     if (window._yas) {
-        window._yas(1 * new Date(), '2.1.1', 'yohobuy_m', uid, '', '');
+        window._yas(1 * new Date(), '2.1.2', 'yohobuy_m', uid, '', '');
 
         // 发送埋点数据
         sendBpData = function(bpIdArr) {

 {
   "name": "yohobuy",
-  "version": "5.3.13",
+  "version": "5.3.14",
   "description": "yohobuy statics",
   "keywords": [],
   "homepage": "",

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "5.3.13"
+application.version = "5.3.14"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "5.3.13"
+application.version = "5.3.14"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "5.3.13"
+application.version = "5.3.14"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "5.3.13"
+application.version = "5.3.14"
 
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"