Merge branch 'master' into gray

@@ -60,6 +60,7 @@
     "request-promise": "^3.0.0",
     "serve-favicon": "^2.3.0",
     "uuid": "^2.0.2",
+    "yoho-express-session": "^2.0.0",
     "yoho-node-lib": "0.2.2",
     "yoho-zookeeper": "^1.0.6"
   },

@@ -109,7 +109,7 @@ function getShoppingKey() {
     a.src = j;
     m.parentNode.insertBefore(a, m);
 }(window, document, 'script', (document.location.protocol === 'https:' ? 'https' : 'http') + '://' + // eslint-disable-line
-    'cdn.yoho.cn/yas-jssdk/1.0.18/yas.js', '_yas')); // eslint-disable-line
+    'cdn.yoho.cn/yas-jssdk/2.1.0/yas.js', '_yas')); // eslint-disable-line
 
 (function() {
     var uid = getUid();
@@ -119,7 +119,7 @@ function getShoppingKey() {
     window._ozuid = uid; // 暴露ozuid
 
     if (window._yas) {
-        window._yas(1 * new Date(), '1.0.18', 'yohobuy_web', uid, '', '');
+        window._yas(1 * new Date(), '2.1.0', 'yohobuy_web', uid, '', '');
     }
 }());