Authored by 沈志敏

Merge branch 'master' of git.yoho.cn:fe/yohobuywap-node into feature/featureTemplate2

# Conflicts:
#	doraemon/middleware/limiter/index.js
#	package.json
#	public/js/activity/feature.page.js
#	public/scss/feature/_anchor.css
1 { 1 {
2 "name": "m-yohobuy-node", 2 "name": "m-yohobuy-node",
3 - "version": "5.5.10", 3 + "version": "95.5.15",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {