Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-app-web into feature/ufo

# Conflicts:
#	config/ssr-routes.js

@@ -8,7 +8,7 @@ module.exports = [
     cache: true,
     cackeKey: '$url$params',
     cacheTime: 10
-  }
+  },
   {
     route: /coupon\/ufo/,
     cache: true